diff options
1369 files changed, 35823 insertions, 10584 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0ddf93dbec4f5..fb8c6b53cb5d1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -12,4 +12,21 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. ## Submitting changes -See the nixpkgs manual for details on how to [Submit changes to nixpkgs](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-submitting-changes). +* Format the commits in the following way: + + `(pkg-name | service-name): (from -> to | init at version | refactor | etc)` + + Examples: + + * nginx: init at 2.0.1 + * firefox: 3.0 -> 3.1.1 + * hydra service: add bazBaz option + * nginx service: refactor config generation + +* `meta.description` should: + * Be capitalized + * Not start with the package name + * Not have a dot at the end + +See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-submitting-changes). + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index aac1650ae7aea..ceea615d5d7fd 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -###### Things done: +###### Things done - [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS) - Built on platform(s) @@ -9,13 +9,5 @@ - [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). -###### More - -Fixes issue #<insert id> - -cc @<maintainer> - - --- -_Please note, that points are not mandatory, but rather desired._ diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md index ce61295e56741..b981466bf2e02 100644 --- a/doc/haskell-users-guide.md +++ b/doc/haskell-users-guide.md @@ -647,6 +647,30 @@ command, i.e. by running: rm /nix/var/nix/manifests/* rm /nix/var/nix/channel-cache/* +### How to use the Haste Haskell-to-Javascript transpiler + +Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need +`node`, but it can be useful to test stuff): + + $ nix-shell -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" -p nodejs + +You may not need the following step but if `haste-boot` fails to compile all the +packages it needs, this might do the trick + + $ haste-cabal update + +`haste-boot` builds a set of core libraries so that they can be used from Javascript +transpiled programs: + + $ haste-boot + +Transpile and run a "Hello world" program: + + $ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs + $ hastec --onexec hello-world.hs + $ node hello-world.js + Hello world + ### Builds on Darwin fail with `math.h` not found Users of GHC on Darwin have occasionally reported that builds fail, because the diff --git a/doc/manual.xml b/doc/manual.xml index 2b4f47aff1c8b..de663fcd5b647 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -12,6 +12,7 @@ <xi:include href="introduction.xml" /> <xi:include href="quick-start.xml" /> <xi:include href="stdenv.xml" /> + <xi:include href="multiple-output.xml" /> <xi:include href="configuration.xml" /> <xi:include href="functions.xml" /> <xi:include href="meta.xml" /> diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml new file mode 100644 index 0000000000000..1821861adf714 --- /dev/null +++ b/doc/multiple-output.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter [ + <!ENTITY ndash "–"> <!-- @vcunat likes to use this one ;-) --> +]> +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="chap-multiple-output"> + +<title>Multiple-output packages</title> + +<section><title>Introduction</title> + <para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.</para> + <para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.</para> + <note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note> +</section> + +<section><title>Installing a split package</title> + <para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para> + <warning><para>Currently <command>nix-env</command> almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged.</para></warning> + <itemizedlist> + <listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names.</para></listitem> + <listitem><para>You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para> + <para>TODO: more about tweaking the attribute, etc.</para></listitem> + <listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para> + <note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note> + </listitem> + </itemizedlist> +</section> + +<section><title>Using a split package</title> + <para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para> + <para>When a multiple-output derivation gets into a build input of another derivation, the first output is added (<varname>.dev</varname> by convention) and also <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname>. (See <xref linkend="multiple-output-file-type-groups" />.)</para> +</section> + + +<section><title>Writing a split derivation</title> + <para>Here you find how to write a derivation that produces multiple outputs.</para> + <para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>>; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para> + <programlisting>outputs = [ "dev" "out" "bin" "doc" ];</programlisting> + <para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should usually be <varname>dev</varname>; typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para> + + <note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note> + + <section xml:id="multiple-output-file-type-groups"> + <title>File type groups</title> + <para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined.</para> + <variablelist> + <varlistentry><term><varname> + $outputDev</varname></term><listitem><para> + is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputBin</varname></term><listitem><para> + is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputLib</varname></term><listitem><para> + is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputDoc</varname></term><listitem><para> + is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputDocdev</varname></term><listitem><para> + is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and man3 pages in there. It goes to <varname>docdev</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputMan</varname></term><listitem><para> + is for man pages (except for section 3). They go to <varname>man</varname> or <varname>doc</varname> or <varname>$outputBin</varname> by default. + </para></listitem></varlistentry> + <varlistentry><term><varname> + $outputInfo</varname></term><listitem><para> + is for info pages. They go to <varname>info</varname> or <varname>doc</varname> or <varname>$outputMan</varname> by default. + </para></listitem></varlistentry> + </variablelist> + </section> + + <section><title>Common caveats</title> + <itemizedlist> + <listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem> + <listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)</para></listitem> + <listitem><para>Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem> + <listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem> + </itemizedlist> + </section> + +</section><!--Writing a split derivation--> + +</chapter> + diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 51a27dcdbc08b..895892938442d 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -956,7 +956,7 @@ following: phase.</para></listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id="stdenv-separateDebugInfo"> <term><varname>separateDebugInfo</varname></term> <listitem><para>If set to <literal>true</literal>, the standard environment will enable debug information in C/C++ builds. After diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4161fa546c8fa..70986195ae054 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -438,6 +438,24 @@ rec { overrideExisting = old: new: old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old)); + /* Try given attributes in order. If no attributes are found, return + attribute list itself. + + Example: + tryAttrs ["a" "b"] { a = 1; b = 2; } + => 1 + tryAttrs ["a" "b"] { c = 3; } + => { c = 3; } + */ + tryAttrs = allAttrs: set: + let tryAttrs_ = attrs: + if attrs == [] then set + else + (let h = head attrs; in + if hasAttr h set then getAttr h set + else tryAttrs_ (tail attrs)); + in tryAttrs_ allAttrs; + /*** deprecated stuff ***/ diff --git a/lib/customisation.nix b/lib/customisation.nix index 585495469b249..efe82d7866001 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -129,7 +129,7 @@ rec { }; outputsList = map outputToAttrListElement outputs; - in commonAttrs.${drv.outputName}; + in commonAttrs // { outputUnspecified = true; }; /* Strip a derivation of all non-essential attributes, returning diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d00e84140a8eb..720824ee66e73 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -81,6 +81,8 @@ copumpkin = "Dan Peebles <pumpkingod@gmail.com>"; coroa = "Jonas Hörsch <jonas@chaoflow.net>"; couchemar = "Andrey Pavlov <couchemar@yandex.ru>"; + cransom = "Casey Ransom <cransom@hubns.net>"; + CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>"; cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; DamienCassou = "Damien Cassou <damien@cassou.me>"; @@ -117,6 +119,7 @@ ertes = "Ertugrul Söylemez <ertesx@gmx.de>"; exi = "Reno Reckling <nixos@reckling.org>"; exlevan = "Alexey Levan <exlevan@gmail.com>"; + expipiplus1 = "Joe Hermaszewski <nix@monoid.al>"; fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>"; falsifian = "James Cook <james.cook@utoronto.ca>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; @@ -137,7 +140,6 @@ garrison = "Jim Garrison <jim@garrison.cc>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; - gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; @@ -148,7 +150,7 @@ havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; - hiberno = "Christian Lask <mail@elfsechsundzwanzig.de>"; + hiberno = "Christian Lask <hiberno@hiberno.net>"; hinton = "Tom Hinton <t@larkery.com>"; hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>"; iand675 = "Ian Duncan <ian@iankduncan.com>"; @@ -231,7 +233,9 @@ mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>"; + moretea = "Maarten Hoogendoorn <maarten@moretea.nl>"; mornfall = "Petr Ročkai <me@mornfall.net>"; + MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; @@ -239,6 +243,7 @@ mtreskin = "Max Treskin <zerthurd@gmail.com>"; mudri = "James Wood <lamudri@gmail.com>"; muflax = "Stefan Dorn <mail@muflax.com>"; + myrl = "Myrl Hex <myrl.0xf@gmail.com>"; nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>"; nequissimus = "Tim Steinbach <tim@nequissimus.com>"; @@ -343,6 +348,7 @@ the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; theuni = "Christian Theune <ct@flyingcircus.io>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; + timbertson = "Tim Cuthbertson <tim@gfxmonk.net>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; tohl = "Tomas Hlavaty <tom@logand.com>"; tokudan = "Daniel Frank <git@danielfrank.net>"; @@ -366,6 +372,7 @@ vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>"; vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; + vrthra = "Rahul Gopinath <rahul@gopinath.org>"; wedens = "wedens <kirill.wedens@gmail.com>"; willtim = "Tim Philip Williams <tim.williams.public@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; diff --git a/lib/strings.nix b/lib/strings.nix index 01a6f181d0389..bda96fb32da02 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -88,6 +88,16 @@ rec { makeSearchPath = subDir: packages: concatStringsSep ":" (map (path: path + "/" + subDir) packages); + /* Construct a Unix-style search path, given trying outputs in order. + If no output is found, fallback to `.out` and then to the default. + + Example: + makeSearchPathOutputs "bin" ["bin"] [ pkgs.openssl pkgs.zlib ] + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-bin/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin" + */ + makeSearchPathOutputs = subDir: outputs: pkgs: + makeSearchPath subDir (map (pkg: if pkg.outputUnspecified or false then lib.tryAttrs (outputs ++ ["out"]) pkg else pkg) pkgs); + /* Construct a library search path (such as RPATH) containing the libraries for a set of packages @@ -98,7 +108,9 @@ rec { makeLibraryPath [ pkgs.openssl pkgs.zlib ] => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib" */ - makeLibraryPath = makeSearchPath "lib"; + makeLibraryPath = pkgs: makeSearchPath "lib" + # try to guess the right output of each pkg + (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs); /* Construct a binary search path (such as $PATH) containing the binaries for a set of packages. @@ -107,7 +119,8 @@ rec { makeBinPath ["/root" "/usr" "/usr/local"] => "/root/bin:/usr/bin:/usr/local/bin" */ - makeBinPath = makeSearchPath "bin"; + makeBinPath = pkgs: makeSearchPath "bin" + (map (pkg: if pkg.outputUnspecified or false then pkg.bin or (pkg.out or pkg) else pkg) pkgs); /* Construct a perl search path (such as $PERL5LIB) @@ -119,7 +132,8 @@ rec { makePerlPath [ pkgs.perlPackages.NetSMTP ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ - makePerlPath = makeSearchPath "lib/perl5/site_perl"; + makePerlPath = pkgs: makeSearchPath "lib/perl5/site_perl" + (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs); /* Dependening on the boolean `cond', return either the given string or the empty string. Useful to contatenate against a bigger string. diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 0065945966026..ad79af90901e8 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,12 +14,12 @@ let operator = const [ ]; }); - urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; + urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && drv ? urls) + && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure { diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index caba8fb1f4adc..cfa5619938bbb 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -27,7 +27,9 @@ effect after you run <command>nixos-rebuild</command>.</para> <!-- FIXME: auto-include NixOS module docs --> <xi:include href="postgresql.xml" /> <xi:include href="gitlab.xml" /> +<xi:include href="taskserver.xml" /> <xi:include href="acme.xml" /> +<xi:include href="input-methods.xml" /> <!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 746ddc071b6a2..86a39322ba510 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -44,7 +44,7 @@ let echo "for hints about the offending path)." exit 1 fi - ${libxslt}/bin/xsltproc \ + ${libxslt.bin}/bin/xsltproc \ --stringparam revision '${revision}' \ -o $out ${./options-to-docbook.xsl} $optionsXML ''; @@ -57,7 +57,9 @@ let chmod -R u+w . cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml + cp ${../../modules/services/misc/taskserver/doc.xml} configuration/taskserver.xml cp ${../../modules/security/acme.xml} configuration/acme.xml + cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version ''; diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 7e71df28cdb39..4a0b3fee7c182 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -157,10 +157,6 @@ $ nano /mnt/etc/nixos/configuration.nix <command>nixos-generate-config</command> will figure out the required modules.</para></note> - <para>Examples of real-world NixOS configuration files can be - found at <link - xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para> - </listitem> <listitem><para>Do the installation: diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 1528c8a724633..620c3e362a653 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -63,11 +63,11 @@ has the following highlights:</para> <itemizedlist> <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem> <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/fcitx.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/ibus.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/nabi.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/uim.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/default.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/fcitx.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/ibus.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/nabi.nix</literal></para></listitem> + <listitem><para><literal>i18n/input-method/uim.nix</literal></para></listitem> <listitem><para><literal>programs/fish.nix</literal></para></listitem> <listitem><para><literal>security/acme.nix</literal></para></listitem> <listitem><para><literal>security/audit.nix</literal></para></listitem> diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 8ac0a31f28756..37d6518fd8d73 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -543,7 +543,7 @@ sub waitForX { retry sub { my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); return 0 if $status != 0; - ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1"); + ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; } }); diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index a096a9809ceee..17cb862d29162 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -38,7 +38,7 @@ with lib; # environment.pathsToLink, and we can't have both. #environment.pathsToLink = [ "/lib/debug/.build-id" ]; - environment.outputsToLink = + environment.extraOutputsToInstall = optional config.environment.enableDebugInfo "debug"; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index e078a75b295ca..1eaebe4b2bbdd 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -236,7 +236,7 @@ with lib; # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig. # Otherwise specify only font directories. environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source = - "${pkgs.fontconfig}/etc/fonts/fonts.conf"; + "${pkgs.fontconfig.out}/etc/fonts/fonts.conf"; environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text = let diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index ca498ca499ebe..0c4f4cbfa5c6e 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -148,7 +148,7 @@ in "protocols".source = pkgs.iana_etc + "/etc/protocols"; # /etc/rpc: RPC program numbers. - "rpc".source = pkgs.glibc + "/etc/rpc"; + "rpc".source = pkgs.glibc.out + "/etc/rpc"; # /etc/hosts: Hostname-to-IP mappings. "hosts".text = diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b4ad796d0d51..642aedc3f242c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -26,7 +26,7 @@ let # are built with PulseAudio support (like KDE). clientConf = writeText "client.conf" '' autospawn=${if nonSystemWide then "yes" else "no"} - ${optionalString nonSystemWide "daemon-binary=${cfg.package}/bin/pulseaudio"} + ${optionalString nonSystemWide "daemon-binary=${cfg.package.out}/bin/pulseaudio"} ''; # Write an /etc/asound.conf that causes all ALSA applications to @@ -130,11 +130,11 @@ in { source = clientConf; }; - hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa"; + hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa"; } (mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package.out ]; environment.etc = singleton { target = "asound.conf"; @@ -195,7 +195,7 @@ in { environment.PULSE_RUNTIME_PATH = stateDir; serviceConfig = { Type = "notify"; - ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; + ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index f510b58842e42..d7815324c4c4d 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -73,11 +73,11 @@ in description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>."; }; - outputsToLink = mkOption { + extraOutputsToInstall = mkOption { type = types.listOf types.str; - default = []; - example = [ "doc" ]; - description = "List of package outputs to be symlinked into <filename>/run/current-system/sw</filename>."; + default = [ ]; + example = [ "doc" "info" "docdev" ]; + description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>."; }; }; @@ -123,9 +123,10 @@ in system.path = pkgs.buildEnv { name = "system-path"; paths = config.environment.systemPackages; - inherit (config.environment) pathsToLink outputsToLink; + inherit (config.environment) pathsToLink extraOutputsToInstall; ignoreCollisions = true; # !!! Hacky, should modularise. + # outputs TODO: note that the tools will often not be linked by default postBuild = '' if [ -x $out/bin/update-mime-database -a -w $out/share/mime ]; then diff --git a/nixos/modules/i18n/inputMethod/default.nix b/nixos/modules/i18n/input-method/default.nix index 7e6a25bfb0847..7e6a25bfb0847 100644 --- a/nixos/modules/i18n/inputMethod/default.nix +++ b/nixos/modules/i18n/input-method/default.nix diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml new file mode 100644 index 0000000000000..c55ac1ec2456e --- /dev/null +++ b/nixos/modules/i18n/input-method/default.xml @@ -0,0 +1,131 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="module-services-input-methods"> + +<title>Input Methods</title> + +<para>Input methods are an operating system component that allows any data, such + as keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. Using + an input method is obligatory for any language that has more graphemes than + there are keys on the keyboard.</para> + +<para>The following input methods are available in NixOS:</para> + +<itemizedlist> + <listitem><para>IBus: The intelligent input bus.</para></listitem> + <listitem><para>Fcitx: A customizable lightweight input + method.</para></listitem> + <listitem><para>Nabi: A Korean input method based on XIM.</para></listitem> + <listitem><para>Uim: The universal input method, is a library with a XIM + bridge.</para></listitem> +</itemizedlist> + +<section><title>IBus</title> + +<para>IBus is an Intelligent Input Bus. It provides full featured and user + friendly input method user interface.</para> + +<para>The following snippet can be used to configure IBus:</para> + +<programlisting> +i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; +}; +</programlisting> + +<para><literal>i18n.inputMethod.ibus.engines</literal> is optional and can be + used to add extra IBus engines.</para> + +<para>Available extra IBus engines are:</para> + +<itemizedlist> + <listitem><para>Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji + mixed text.</para></listitem> + <listitem><para>Hangul (<literal>ibus-engines.hangul</literal>): Korean input + method.</para></listitem> + <listitem><para>m17n (<literal>ibus-engines.m17n</literal>): m17n is an input + method that uses input methods and corresponding icons in the m17n + database.</para></listitem> + <listitem><para>mozc (<literal>ibus-engines.mozc</literal>): A Japanese input + method from Google.</para></listitem> + <listitem><para>Table (<literal>ibus-engines.table</literal>): An input method + that load tables of input methods.</para></listitem> + <listitem><para>table-others (<literal>ibus-engines.table-others</literal>): + Various table-based input methods.</para></listitem> +</itemizedlist> +</section> + +<section><title>Fcitx</title> + +<para>Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input + methods.</para> +<para>The following snippet can be used to configure Fcitx:</para> + +<programlisting> +i18n.inputMethod = { + enabled = "fcitx"; + fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; +}; +</programlisting> + +<para><literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be + used to add extra Fcitx engines.</para> + +<para>Available extra Fcitx engines are:</para> + +<itemizedlist> + <listitem><para>Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a + system for Japanese input method. It converts Hiragana text to Kana Kanji + mixed text.</para></listitem> + <listitem><para>Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is + an intelligent Zhuyin input method. It is one of the most popular input + methods among Traditional Chinese Unix users.</para></listitem> + <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input + method.</para></listitem> + <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input + method that uses input methods and corresponding icons in the m17n + database.</para></listitem> + <listitem><para>mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input + method from Google.</para></listitem> + <listitem><para>table-others (<literal>fcitx-engines.table-others</literal>): + Various table-based input methods.</para></listitem> +</itemizedlist> +</section> + +<section><title>Nabi</title> + +<para>Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters + (hanja).</para> +<para>The following snippet can be used to configure Nabi:</para> + +<programlisting> +i18n.inputMethod = { + enabled = "nabi"; +}; +</programlisting> +</section> + +<section><title>Uim</title> + +<para>Uim (short for "universal input method") is a multilingual input method + framework. Applications can use it through so-called bridges.</para> +<para>The following snippet can be used to configure uim:</para> + +<programlisting> +i18n.inputMethod = { + enabled = "uim"; +}; +</programlisting> + +<para>Note: The <literal>i18n.inputMethod.uim.toolbar</literal> option can be + used to choose uim toolbar.</para> + +</section> +</chapter> diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix index 8e31743504f12..8e31743504f12 100644 --- a/nixos/modules/i18n/inputMethod/fcitx.nix +++ b/nixos/modules/i18n/input-method/fcitx.nix diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index bb80f43634d37..bb80f43634d37 100644 --- a/nixos/modules/i18n/inputMethod/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/input-method/nabi.nix index c6708365effa0..c6708365effa0 100644 --- a/nixos/modules/i18n/inputMethod/nabi.nix +++ b/nixos/modules/i18n/input-method/nabi.nix diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/input-method/uim.nix index f8a3e560656dd..f8a3e560656dd 100644 --- a/nixos/modules/i18n/inputMethod/uim.nix +++ b/nixos/modules/i18n/input-method/uim.nix diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix index 2da330f9b5716..79ccb5c3d18a0 100644 --- a/nixos/modules/installer/tools/auto-upgrade.nix +++ b/nixos/modules/installer/tools/auto-upgrade.nix @@ -78,7 +78,7 @@ let cfg = config.system.autoUpgrade; in HOME = "/root"; }; - path = [ pkgs.gnutar pkgs.xz config.nix.package ]; + path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ]; script = '' ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags} diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index d3005cdfd6f79..8e75f8d3c40af 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -474,7 +474,7 @@ my $hwConfig = <<EOF; boot.kernelModules = [$kernelModules ]; boot.extraModulePackages = [$modulePackages ]; $fsAndSwap - nix.maxJobs = $cpus; + nix.maxJobs = lib.mkDefault $cpus; ${\join "", (map { " $_\n" } (uniq @attrs))}} EOF diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 1e14fe655fc08..9e6bbc744381c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -47,6 +47,7 @@ #floppy = 18; # unused #uucp = 19; # unused #lp = 20; # unused + #proc = 21; # unused pulseaudio = 22; # must match `pulseaudio' GID gpsd = 23; #cdrom = 24; # unused @@ -259,6 +260,9 @@ hydra-www = 236; syncthing = 237; mfi = 238; + caddy = 239; + taskd = 240; + factorio = 241; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -288,6 +292,7 @@ floppy = 18; uucp = 19; lp = 20; + proc = 21; pulseaudio = 22; # must match `pulseaudio' UID gpsd = 23; cdrom = 24; @@ -489,6 +494,9 @@ radicale = 234; syncthing = 237; #mfi = 238; # unused + caddy = 239; + taskd = 240; + factorio = 241; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 5b560cedc623a..27a0fa6cf3d48 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -88,7 +88,7 @@ in { serviceConfig.PrivateNetwork = "yes"; serviceConfig.NoNewPrivileges = "yes"; serviceConfig.ReadOnlyDirectories = "/"; - serviceConfig.ReadWriteDirectories = cfg.output; + serviceConfig.ReadWriteDirectories = dirOf cfg.output; }; systemd.timers.update-locatedb = mkIf cfg.enable diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 284b2b9f8824e..756804b5d0968 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,11 +41,11 @@ ./hardware/video/nvidia.nix ./hardware/video/ati.nix ./hardware/video/webcam/facetimehd.nix - ./i18n/inputMethod/default.nix - ./i18n/inputMethod/fcitx.nix - ./i18n/inputMethod/ibus.nix - ./i18n/inputMethod/nabi.nix - ./i18n/inputMethod/uim.nix + ./i18n/input-method/default.nix + ./i18n/input-method/fcitx.nix + ./i18n/input-method/ibus.nix + ./i18n/input-method/nabi.nix + ./i18n/input-method/uim.nix ./installer/tools/auto-upgrade.nix ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix @@ -90,6 +90,7 @@ ./security/ca.nix ./security/duosec.nix ./security/grsecurity.nix + ./security/hidepid.nix ./security/oath.nix ./security/pam.nix ./security/pam_usb.nix @@ -157,6 +158,7 @@ ./services/desktops/gnome3/tracker.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/games/factorio.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix @@ -249,6 +251,7 @@ ./services/misc/sundtek.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix + ./services/misc/taskserver ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix @@ -328,7 +331,7 @@ ./services/networking/hostapd.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix - ./services/networking/iodined.nix + ./services/networking/iodine.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/kippo.nix ./services/networking/lambdabot.nix @@ -425,6 +428,7 @@ ./services/system/nscd.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix + ./services/torrent/flexget.nix ./services/torrent/peerflix.nix ./services/torrent/transmission.nix ./services/ttys/agetty.nix @@ -432,6 +436,7 @@ ./services/ttys/kmscon.nix ./services/web-apps/pump.io.nix ./services/web-servers/apache-httpd/default.nix + ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/cgit.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index b8057cadce25c..20a1f7f1ed8c2 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -35,7 +35,7 @@ # Tools to create / manipulate filesystems. pkgs.ntfsprogs # for resizing NTFS partitions pkgs.dosfstools - pkgs.xfsprogs + pkgs.xfsprogs.bin pkgs.jfsutils pkgs.f2fs-tools diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 1c3c07a1c2109..e4e264ec00363 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -56,7 +56,7 @@ in */ shellAliases = mkOption { - default = config.environment.shellAliases // { which = "type -P"; }; + default = config.environment.shellAliases; description = '' Set of aliases for bash shell. See <option>environment.shellAliases</option> for an option format description. diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b4259f7ec87dc..7a4b78118ce66 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -101,6 +101,9 @@ in end ''; + # include programs that bring their own completions + environment.pathsToLink = [ "/share/fish/vendor_completions.d" ]; + environment.systemPackages = [ pkgs.fish ]; environment.shells = [ diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix index b285065380496..201144ccb451b 100644 --- a/nixos/modules/programs/man.nix +++ b/nixos/modules/programs/man.nix @@ -23,7 +23,7 @@ with lib; environment.pathsToLink = [ "/share/man" ]; - environment.outputsToLink = [ "man" ]; + environment.extraOutputsToInstall = [ "man" ]; }; diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix index 90b6304fa9990..648fd9a8a94f4 100644 --- a/nixos/modules/programs/xfs_quota.nix +++ b/nixos/modules/programs/xfs_quota.nix @@ -89,8 +89,8 @@ in nameValuePair "xfs_quota-${name}" { description = "Setup xfs_quota for project ${name}"; script = '' - ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} - ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem} + ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} + ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem} ''; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index c6a781b6f00f2..84eccfd512921 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -101,6 +101,13 @@ with lib; # Enlightenment (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]) + # Iodine + (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ]) + (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ]) + (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ]) + (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ]) + (mkRemovedOptionModule [ "services" "iodined" "client" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ]) (mkRemovedOptionModule [ "programs" "bash" "enable" ]) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index c5cd0fb60ee9a..cb5410a5f15d8 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -152,7 +152,7 @@ in in nameValuePair ("acme-${cert}") ({ - description = "ACME cert renewal for ${cert} using simp_le"; + description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" ]; serviceConfig = { Type = "oneshot"; @@ -192,7 +192,7 @@ in systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") ({ - description = "timer for ACME cert renewal of ${cert}"; + description = "Renew ACME Certificate for ${cert}"; wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = cfg.renewInterval; diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index b89b379ae6668..d766f6badfc7e 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -28,9 +28,9 @@ with lib; capability setuid, network inet raw, - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.libcap}/lib/libcap.so* mr, - ${pkgs.attr}/lib/libattr.so* mr, + ${pkgs.glibc.out}/lib/*.so mr, + ${pkgs.libcap.out}/lib/libcap.so* mr, + ${pkgs.attr.out}/lib/libattr.so* mr, ${pkgs.iputils}/bin/ping mixr, /var/setuid-wrappers/ping.real r, diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix new file mode 100644 index 0000000000000..8271578c55d68 --- /dev/null +++ b/nixos/modules/security/hidepid.nix @@ -0,0 +1,42 @@ +{ config, pkgs, lib, ... }: +with lib; + +{ + options = { + security.hideProcessInformation = mkEnableOption "" // { description = '' + Restrict access to process information to the owning user. Enabling + this option implies, among other things, that command-line arguments + remain private. This option is recommended for most systems, unless + there's a legitimate reason for allowing unprivileged users to inspect + the process information of other users. + + Members of the group "proc" are exempt from process information hiding. + To allow a service to run without process information hiding, add "proc" + to its supplementary groups via + <option>systemd.services.<name?>.serviceConfig.SupplementaryGroups</option>. + ''; }; + }; + + config = mkIf config.security.hideProcessInformation { + users.groups.proc.gid = config.ids.gids.proc; + + systemd.services.hidepid = { + wantedBy = [ "local-fs.target" ]; + after = [ "systemd-remount-fs.service" ]; + before = [ "local-fs-pre.target" "local-fs.target" "shutdown.target" ]; + wants = [ "local-fs-pre.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = ''${pkgs.utillinux}/bin/mount -o remount,hidepid=2,gid=${toString config.ids.gids.proc} /proc''; + ExecStop = ''${pkgs.utillinux}/bin/mount -o remount,hidepid=0,gid=0 /proc''; + }; + + unitConfig = { + DefaultDependencies = false; + Conflicts = "shutdown.target"; + }; + }; + }; +} diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 95b659d96f0f2..507f81bbf0737 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -59,9 +59,9 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.polkit ]; + environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ]; - systemd.packages = [ pkgs.polkit ]; + systemd.packages = [ pkgs.polkit.out ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; systemd.services.polkit.unitConfig.X-StopIfChanged = false; @@ -79,7 +79,7 @@ in ${cfg.extraConfig} ''; #TODO: validation on compilation (at least against typos) - services.dbus.packages = [ pkgs.polkit ]; + services.dbus.packages = [ pkgs.polkit.out ]; security.pam.services.polkit-1 = {}; @@ -90,7 +90,7 @@ in owner = "root"; group = "root"; setuid = true; - source = "${pkgs.polkit}/lib/polkit-1/polkit-agent-helper-1"; + source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; } ]; diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index 2a289dc402ce8..7d69f9b1183da 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -8,12 +8,12 @@ let setuidWrapper = pkgs.stdenv.mkDerivation { name = "setuid-wrapper"; - buildCommand = '' + unpackPhase = "true"; + installPhase = '' mkdir -p $out/bin cp ${./setuid-wrapper.c} setuid-wrapper.c gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \ setuid-wrapper.c -o $out/bin/setuid-wrapper - strip -S $out/bin/setuid-wrapper ''; }; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index cfb1cd773c7fe..6fd39e68b1d9c 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -161,11 +161,11 @@ in { ''; postStart = '' - until ${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do + until ${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do sleep 10 done while true ; do - index=`${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}` + index=`${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}` if [[ !("$index" =~ 'Please wait while Jenkins is restarting' || "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then exit 0 diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 6fd901a00559d..9e86559dda04d 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -87,7 +87,7 @@ in mkdir -p ${cfg.dataDir} chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} ''; - serviceConfig.ExecStart = "${openldap}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}"; + serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}"; }; users.extraUsers.openldap = diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix index c4f41a6125c71..a07cdadbb12bf 100644 --- a/nixos/modules/services/desktops/gnome3/gvfs.nix +++ b/nixos/modules/services/desktops/gnome3/gvfs.nix @@ -37,7 +37,7 @@ in services.dbus.packages = [ gnome3.gvfs ]; - services.udev.packages = [ pkgs.libmtp ]; + services.udev.packages = [ pkgs.libmtp.bin ]; }; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix new file mode 100644 index 0000000000000..fff0d091c7a87 --- /dev/null +++ b/nixos/modules/services/games/factorio.nix @@ -0,0 +1,102 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.factorio; + name = "Factorio"; + stateDir = "/var/lib/factorio"; + configFile = pkgs.writeText "factorio.conf" '' + use-system-read-write-data-directories=true + [path] + read-data=${pkgs.factorio-headless}/share/factorio/data + write-data=${stateDir} + ''; +in +{ + options = { + services.factorio = { + enable = mkEnableOption name; + port = mkOption { + type = types.int; + default = 34197; + description = '' + The port to which the service should bind. + + This option will also open up the UDP port in the firewall configuration. + ''; + }; + saveName = mkOption { + type = types.string; + default = "default"; + description = '' + The name of the savegame that will be used by the server. + + When not present in ${stateDir}/saves, it will be generated before starting the service. + ''; + }; + # TODO Add more individual settings as nixos-options? + # TODO XXX The server tries to copy a newly created config file over the old one + # on shutdown, but fails, because it's in the nix store. When is this needed? + # Can an admin set options in-game and expect to have them persisted? + configFile = mkOption { + type = types.path; + default = configFile; + defaultText = "configFile"; + description = '' + The server's configuration file. + + The default file generated by this module contains lines essential to + the server's operation. Use its contents as a basis for any + customizations. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users = { + users.factorio = { + uid = config.ids.uids.factorio; + description = "Factorio server user"; + group = "factorio"; + home = stateDir; + createHome = true; + }; + + groups.factorio = { + gid = config.ids.gids.factorio; + }; + }; + + systemd.services.factorio = { + description = "Factorio headless server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + test -e ${stateDir}/saves/${cfg.saveName}.zip || ${pkgs.factorio-headless}/bin/factorio \ + --config=${cfg.configFile} \ + --create=${cfg.saveName} + ''; + + serviceConfig = { + User = "factorio"; + Group = "factorio"; + Restart = "always"; + KillSignal = "SIGINT"; + WorkingDirectory = stateDir; + PrivateTmp = true; + UMask = "0007"; + ExecStart = toString [ + "${pkgs.factorio-headless}/bin/factorio" + "--config=${cfg.configFile}" + "--port=${toString cfg.port}" + "--start-server=${cfg.saveName}" + ]; + }; + }; + + networking.firewall.allowedUDPPorts = [ cfg.port ]; + }; +} diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index e267aeee030c8..8e883ed7775fb 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -72,7 +72,7 @@ let run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' | sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) for i in $import_progs $run_progs; do - if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then + if [[ ! -x ${udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then echo "FAIL" echo "$i is called in udev rules but not installed by udev" exit 1 diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 739d76fbf1f5b..2198842a45116 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -51,7 +51,7 @@ in systemd.services.upower = { description = "Power Management Daemon"; - path = [ pkgs.glib ]; # needed for gdbus + path = [ pkgs.glib.out ]; # needed for gdbus serviceConfig = { Type = "dbus"; BusName = "org.freedesktop.UPower"; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 0a0e160a7cc32..add339f9bdfed 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -65,7 +65,7 @@ in { }; postStart = '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/'; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/'; do sleep 1; done ''; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 91047ead43643..2d406b6344371 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -228,7 +228,7 @@ in { '') + optionalString (service == "sql" && sql.driver == "sqlite") '' cat "${gammuPackage}/${initDBDir}/sqlite.sql" \ - | ${pkgs.sqlite}/bin/sqlite3 ${sql.database} + | ${pkgs.sqlite.bin}/bin/sqlite3 ${sql.database} '' + (let execPsql = extraArgs: concatStringsSep " " [ (optionalString (sql.password != null) "PGPASSWORD=${sql.password}") diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e079a5d80d4cb..911f79e5756a3 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -358,7 +358,7 @@ in systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = - { path = [ nix pkgs.openssl pkgs.utillinux config.programs.ssh.package ] + { path = [ nix pkgs.openssl.bin pkgs.utillinux config.programs.ssh.package ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 8ab2a9307a719..8d46bca99f999 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -10,7 +10,7 @@ let plugins.cura.cura_engine = "${pkgs.curaengine}/bin/CuraEngine"; server.host = cfg.host; server.port = cfg.port; - webcam.ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg"; }; fullConfig = recursiveUpdate cfg.extraConfig baseConfig; @@ -102,7 +102,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pluginsEnv ]; - environment.PYTHONPATH = makeSearchPath pkgs.python.sitePackages [ pluginsEnv ]; + environment.PYTHONPATH = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ]; preStart = '' mkdir -p "${cfg.stateDir}" diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 875771dfa37fa..92b352db416c2 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -128,6 +128,7 @@ in Group = cfg.group; PermissionsStartOnly = "true"; ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'"; + Restart = "on-failure"; }; environment = { PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir; diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 020d53a481de1..c1ebe418f727b 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -97,7 +97,7 @@ in transcoders = mkOption { type = types.listOf types.path; - default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; + default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 37dd133e137d8..c74befac749db 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -38,7 +38,7 @@ in after = [ "network-interfaces.target" ]; wantedBy = [ "multi-user.target" ]; preStart = "mkdir -p ${cfg.svnBaseDir}"; - script = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; + script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; }; }; } diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix new file mode 100644 index 0000000000000..8459aafeee737 --- /dev/null +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -0,0 +1,541 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.taskserver; + + taskd = "${pkgs.taskserver}/bin/taskd"; + + mkVal = val: + if val == true then "true" + else if val == false then "false" + else if isList val then concatStringsSep ", " val + else toString val; + + mkConfLine = key: val: let + result = "${key} = ${mkVal val}"; + in optionalString (val != null && val != []) result; + + mkManualPkiOption = desc: mkOption { + type = types.nullOr types.path; + default = null; + description = desc + '' + <note><para> + Setting this option will prevent automatic CA creation and handling. + </para></note> + ''; + }; + + manualPkiOptions = { + ca.cert = mkManualPkiOption '' + Fully qualified path to the CA certificate. + ''; + + server.cert = mkManualPkiOption '' + Fully qualified path to the server certificate. + ''; + + server.crl = mkManualPkiOption '' + Fully qualified path to the server certificate revocation list. + ''; + + server.key = mkManualPkiOption '' + Fully qualified path to the server key. + ''; + }; + + mkAutoDesc = preamble: '' + ${preamble} + + <note><para> + This option is for the automatically handled CA and will be ignored if any + of the <option>services.taskserver.pki.manual.*</option> options are set. + </para></note> + ''; + + mkExpireOption = desc: mkOption { + type = types.nullOr types.int; + default = null; + example = 365; + apply = val: if isNull val then -1 else val; + description = mkAutoDesc '' + The expiration time of ${desc} in days or <literal>null</literal> for no + expiration time. + ''; + }; + + autoPkiOptions = { + bits = mkOption { + type = types.int; + default = 4096; + example = 2048; + description = mkAutoDesc "The bit size for generated keys."; + }; + + expiration = { + ca = mkExpireOption "the CA certificate"; + server = mkExpireOption "the server certificate"; + client = mkExpireOption "client certificates"; + crl = mkExpireOption "the certificate revocation list (CRL)"; + }; + }; + + needToCreateCA = let + notFound = path: let + dotted = concatStringsSep "." path; + in throw "Can't find option definitions for path `${dotted}'."; + findPkiDefinitions = path: attrs: let + mkSublist = key: val: let + newPath = path ++ singleton key; + in if isOption val + then attrByPath newPath (notFound newPath) cfg.pki.manual + else findPkiDefinitions newPath val; + in flatten (mapAttrsToList mkSublist attrs); + in all isNull (findPkiDefinitions [] manualPkiOptions); + + configFile = pkgs.writeText "taskdrc" ('' + # systemd related + daemon = false + log = - + + # logging + ${mkConfLine "debug" cfg.debug} + ${mkConfLine "ip.log" cfg.ipLog} + + # general + ${mkConfLine "ciphers" cfg.ciphers} + ${mkConfLine "confirmation" cfg.confirmation} + ${mkConfLine "extensions" cfg.extensions} + ${mkConfLine "queue.size" cfg.queueSize} + ${mkConfLine "request.limit" cfg.requestLimit} + + # client + ${mkConfLine "client.allow" cfg.allowedClientIDs} + ${mkConfLine "client.deny" cfg.disallowedClientIDs} + + # server + server = ${cfg.listenHost}:${toString cfg.listenPort} + ${mkConfLine "trust" cfg.trust} + + # PKI options + ${if needToCreateCA then '' + ca.cert = ${cfg.dataDir}/keys/ca.cert + server.cert = ${cfg.dataDir}/keys/server.cert + server.key = ${cfg.dataDir}/keys/server.key + server.crl = ${cfg.dataDir}/keys/server.crl + '' else '' + ca.cert = ${cfg.pki.ca.cert} + server.cert = ${cfg.pki.server.cert} + server.key = ${cfg.pki.server.key} + server.crl = ${cfg.pki.server.crl} + ''} + '' + cfg.extraConfig); + + orgOptions = { name, ... }: { + options.users = mkOption { + type = types.uniq (types.listOf types.str); + default = []; + example = [ "alice" "bob" ]; + description = '' + A list of user names that belong to the organization. + ''; + }; + + options.groups = mkOption { + type = types.listOf types.str; + default = []; + example = [ "workers" "slackers" ]; + description = '' + A list of group names that belong to the organization. + ''; + }; + }; + + mkShellStr = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + + certtool = "${pkgs.gnutls.bin}/bin/certtool"; + + nixos-taskserver = pkgs.buildPythonPackage { + name = "nixos-taskserver"; + namePrefix = ""; + + src = pkgs.runCommand "nixos-taskserver-src" {} '' + mkdir -p "$out" + cat "${pkgs.substituteAll { + src = ./helper-tool.py; + inherit taskd certtool; + inherit (cfg) dataDir user group fqdn; + certBits = cfg.pki.auto.bits; + clientExpiration = cfg.pki.auto.expiration.client; + crlExpiration = cfg.pki.auto.expiration.crl; + }}" > "$out/main.py" + cat > "$out/setup.py" <<EOF + from setuptools import setup + setup(name="nixos-taskserver", + py_modules=["main"], + install_requires=["Click"], + entry_points="[console_scripts]\\nnixos-taskserver=main:cli") + EOF + ''; + + propagatedBuildInputs = [ pkgs.pythonPackages.click ]; + }; + +in { + options = { + services.taskserver = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable the Taskwarrior server. + + More instructions about NixOS in conjuction with Taskserver can be + found in the NixOS manual at + <olink targetdoc="manual" targetptr="module-taskserver"/>. + ''; + }; + + user = mkOption { + type = types.str; + default = "taskd"; + description = "User for Taskserver."; + }; + + group = mkOption { + type = types.str; + default = "taskd"; + description = "Group for Taskserver."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/taskserver"; + description = "Data directory for Taskserver."; + }; + + ciphers = mkOption { + type = types.nullOr (types.separatedString ":"); + default = null; + example = "NORMAL:-VERS-SSL3.0"; + description = let + url = "https://gnutls.org/manual/html_node/Priority-Strings.html"; + in '' + List of GnuTLS ciphers to use. See the GnuTLS documentation about + priority strings at <link xlink:href="${url}"/> for full details. + ''; + }; + + organisations = mkOption { + type = types.attrsOf (types.submodule orgOptions); + default = {}; + example.myShinyOrganisation.users = [ "alice" "bob" ]; + example.myShinyOrganisation.groups = [ "staff" "outsiders" ]; + example.yetAnotherOrganisation.users = [ "foo" "bar" ]; + description = '' + An attribute set where the keys name the organisation and the values + are a set of lists of <option>users</option> and + <option>groups</option>. + ''; + }; + + confirmation = mkOption { + type = types.bool; + default = true; + description = '' + Determines whether certain commands are confirmed. + ''; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = '' + Logs debugging information. + ''; + }; + + extensions = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Fully qualified path of the Taskserver extension scripts. + Currently there are none. + ''; + }; + + ipLog = mkOption { + type = types.bool; + default = false; + description = '' + Logs the IP addresses of incoming requests. + ''; + }; + + queueSize = mkOption { + type = types.int; + default = 10; + description = '' + Size of the connection backlog, see <citerefentry> + <refentrytitle>listen</refentrytitle> + <manvolnum>2</manvolnum> + </citerefentry>. + ''; + }; + + requestLimit = mkOption { + type = types.int; + default = 1048576; + description = '' + Size limit of incoming requests, in bytes. + ''; + }; + + allowedClientIDs = mkOption { + type = with types; loeOf (either (enum ["all" "none"]) str); + default = []; + example = [ "[Tt]ask [2-9]+" ]; + description = '' + A list of regular expressions that are matched against the reported + client id (such as <literal>task 2.3.0</literal>). + + The values <literal>all</literal> or <literal>none</literal> have + special meaning. Overidden by any entry in the option + <option>services.taskserver.disallowedClientIDs</option>. + ''; + }; + + disallowedClientIDs = mkOption { + type = with types; loeOf (either (enum ["all" "none"]) str); + default = []; + example = [ "[Tt]ask [2-9]+" ]; + description = '' + A list of regular expressions that are matched against the reported + client id (such as <literal>task 2.3.0</literal>). + + The values <literal>all</literal> or <literal>none</literal> have + special meaning. Any entry here overrides those in + <option>services.taskserver.allowedClientIDs</option>. + ''; + }; + + listenHost = mkOption { + type = types.str; + default = "localhost"; + example = "::"; + description = '' + The address (IPv4, IPv6 or DNS) to listen on. + + If the value is something else than <literal>localhost</literal> the + port defined by <option>listenPort</option> is automatically added to + <option>networking.firewall.allowedTCPPorts</option>. + ''; + }; + + listenPort = mkOption { + type = types.int; + default = 53589; + description = '' + Port number of the Taskserver. + ''; + }; + + fqdn = mkOption { + type = types.str; + default = "localhost"; + description = '' + The fully qualified domain name of this server, which is also used + as the common name in the certificates. + ''; + }; + + trust = mkOption { + type = types.enum [ "allow all" "strict" ]; + default = "strict"; + description = '' + Determines how client certificates are validated. + + The value <literal>allow all</literal> performs no client + certificate validation. This is not recommended. The value + <literal>strict</literal> causes the client certificate to be + validated against a CA. + ''; + }; + + pki.manual = manualPkiOptions; + pki.auto = autoPkiOptions; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "client.cert = /tmp/debugging.cert"; + description = '' + Extra lines to append to the taskdrc configuration file. + ''; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.taskserver nixos-taskserver ]; + + users.users = optional (cfg.user == "taskd") { + name = "taskd"; + uid = config.ids.uids.taskd; + description = "Taskserver user"; + group = cfg.group; + }; + + users.groups = optional (cfg.group == "taskd") { + name = "taskd"; + gid = config.ids.gids.taskd; + }; + + systemd.services.taskserver-init = { + wantedBy = [ "taskserver.service" ]; + before = [ "taskserver.service" ]; + description = "Initialize Taskserver Data Directory"; + + preStart = '' + mkdir -m 0770 -p "${cfg.dataDir}" + chown "${cfg.user}:${cfg.group}" "${cfg.dataDir}" + ''; + + script = '' + ${taskd} init + echo "include ${configFile}" > "${cfg.dataDir}/config" + touch "${cfg.dataDir}/.is_initialized" + ''; + + environment.TASKDDATA = cfg.dataDir; + + unitConfig.ConditionPathExists = "!${cfg.dataDir}/.is_initialized"; + + serviceConfig.Type = "oneshot"; + serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; + serviceConfig.PermissionsStartOnly = true; + serviceConfig.PrivateNetwork = true; + serviceConfig.PrivateDevices = true; + serviceConfig.PrivateTmp = true; + }; + + systemd.services.taskserver = { + description = "Taskwarrior Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment.TASKDDATA = cfg.dataDir; + + preStart = let + jsonOrgs = builtins.toJSON cfg.organisations; + jsonFile = pkgs.writeText "orgs.json" jsonOrgs; + helperTool = "${nixos-taskserver}/bin/nixos-taskserver"; + in "${helperTool} process-json '${jsonFile}'"; + + serviceConfig = { + ExecStart = "@${taskd} taskd server"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + Restart = "on-failure"; + PermissionsStartOnly = true; + PrivateTmp = true; + PrivateDevices = true; + User = cfg.user; + Group = cfg.group; + }; + }; + }) + (mkIf needToCreateCA { + systemd.services.taskserver-ca = { + wantedBy = [ "taskserver.service" ]; + after = [ "taskserver-init.service" ]; + before = [ "taskserver.service" ]; + description = "Initialize CA for TaskServer"; + serviceConfig.Type = "oneshot"; + serviceConfig.UMask = "0077"; + serviceConfig.PrivateNetwork = true; + serviceConfig.PrivateTmp = true; + + script = '' + silent_certtool() { + if ! output="$("${certtool}" "$@" 2>&1)"; then + echo "GNUTLS certtool invocation failed with output:" >&2 + echo "$output" >&2 + fi + } + + mkdir -m 0700 -p "${cfg.dataDir}/keys" + chown root:root "${cfg.dataDir}/keys" + + if [ ! -e "${cfg.dataDir}/keys/ca.key" ]; then + silent_certtool -p \ + --bits ${toString cfg.pki.auto.bits} \ + --outfile "${cfg.dataDir}/keys/ca.key" + silent_certtool -s \ + --template "${pkgs.writeText "taskserver-ca.template" '' + cn = ${cfg.fqdn} + expiration_days = ${toString cfg.pki.auto.expiration.ca} + cert_signing_key + ca + ''}" \ + --load-privkey "${cfg.dataDir}/keys/ca.key" \ + --outfile "${cfg.dataDir}/keys/ca.cert" + + chgrp "${cfg.group}" "${cfg.dataDir}/keys/ca.cert" + chmod g+r "${cfg.dataDir}/keys/ca.cert" + fi + + if [ ! -e "${cfg.dataDir}/keys/server.key" ]; then + silent_certtool -p \ + --bits ${toString cfg.pki.auto.bits} \ + --outfile "${cfg.dataDir}/keys/server.key" + + silent_certtool -c \ + --template "${pkgs.writeText "taskserver-cert.template" '' + cn = ${cfg.fqdn} + expiration_days = ${toString cfg.pki.auto.expiration.server} + tls_www_server + encryption_key + signing_key + ''}" \ + --load-ca-privkey "${cfg.dataDir}/keys/ca.key" \ + --load-ca-certificate "${cfg.dataDir}/keys/ca.cert" \ + --load-privkey "${cfg.dataDir}/keys/server.key" \ + --outfile "${cfg.dataDir}/keys/server.cert" + + chgrp "${cfg.group}" \ + "${cfg.dataDir}/keys/server.key" \ + "${cfg.dataDir}/keys/server.cert" + + chmod g+r \ + "${cfg.dataDir}/keys/server.key" \ + "${cfg.dataDir}/keys/server.cert" + fi + + if [ ! -e "${cfg.dataDir}/keys/server.crl" ]; then + silent_certtool --generate-crl \ + --template "${pkgs.writeText "taskserver-crl.template" '' + expiration_days = ${toString cfg.pki.auto.expiration.crl} + ''}" \ + --load-ca-privkey "${cfg.dataDir}/keys/ca.key" \ + --load-ca-certificate "${cfg.dataDir}/keys/ca.cert" \ + --outfile "${cfg.dataDir}/keys/server.crl" + + chgrp "${cfg.group}" "${cfg.dataDir}/keys/server.crl" + chmod g+r "${cfg.dataDir}/keys/server.crl" + fi + + chmod go+x "${cfg.dataDir}/keys" + ''; + }; + }) + (mkIf (cfg.listenHost != "localhost") { + networking.firewall.allowedTCPPorts = [ cfg.listenPort ]; + }) + { meta.doc = ./taskserver.xml; } + ]; +} diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml new file mode 100644 index 0000000000000..48591129264af --- /dev/null +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -0,0 +1,144 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="5.0" + xml:id="module-taskserver"> + + <title>Taskserver</title> + + <para> + Taskserver is the server component of + <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and + open source todo list application. + </para> + + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://taskwarrior.org/docs/#taskd"/> + </para> + + <section> + <title>Configuration</title> + + <para> + Taskserver does all of its authentication via TLS using client + certificates, so you either need to roll your own CA or purchase a + certificate from a known CA, which allows creation of client + certificates. + + These certificates are usually advertised as + <quote>server certificates</quote>. + </para> + + <para> + So in order to make it easier to handle your own CA, there is a helper + tool called <command>nixos-taskserver</command> which manages the custom + CA along with Taskserver organisations, users and groups. + </para> + + <para> + While the client certificates in Taskserver only authenticate whether a + user is allowed to connect, every user has its own UUID which identifies + it as an entity. + </para> + + <para> + With <command>nixos-taskserver</command> the client certificate is created + along with the UUID of the user, so it handles all of the credentials + needed in order to setup the Taskwarrior client to work with a Taskserver. + </para> + </section> + + <section> + <title>The nixos-taskserver tool</title> + + <para> + Because Taskserver by default only provides scripts to setup users + imperatively, the <command>nixos-taskserver</command> tool is used for + addition and deletion of organisations along with users and groups defined + by <option>services.taskserver.organisations</option> and as well for + imperative set up. + </para> + + <para> + The tool is designed to not interfere if the command is used to manually + set up some organisations, users or groups. + </para> + + <para> + For example if you add a new organisation using + <command>nixos-taskserver org add foo</command>, the organisation is not + modified and deleted no matter what you define in + <option>services.taskserver.organisations</option>, even if you're adding + the same organisation in that option. + </para> + + <para> + The tool is modelled to imitate the official <command>taskd</command> + command, documentation for each subcommand can be shown by using the + <option>--help</option> switch. + </para> + </section> + <section> + <title>Declarative/automatic CA management</title> + + <para> + Everything is done according to what you specify in the module options, + however in order to set up a Taskwarrior client for synchronisation with a + Taskserver instance, you have to transfer the keys and certificates to the + client machine. + </para> + + <para> + This is done using + <command>nixos-taskserver user export $orgname $username</command> which + is printing a shell script fragment to stdout which can either be used + verbatim or adjusted to import the user on the client machine. + </para> + + <para> + For example, let's say you have the following configuration: +<screen> +{ + services.taskserver.enable = true; + services.taskserver.fqdn = "server"; + services.taskserver.listenHost = "::"; + services.taskserver.organisations.my-company.users = [ "alice" ]; +} +</screen> + This creates an organisation called <literal>my-company</literal> with the + user <literal>alice</literal>. + </para> + + <para> + Now in order to import the <literal>alice</literal> user to another + machine <literal>alicebox</literal>, all we need to do is something like + this: +<screen> +$ ssh server nixos-taskserver user export my-company alice | sh +</screen> + Of course, if no SSH daemon is available on the server you can also copy + & paste it directly into a shell. + </para> + + <para> + After this step the user should be set up and you can start synchronising + your tasks for the first time with <command>task sync init</command> on + <literal>alicebox</literal>. + </para> + + <para> + Subsequent synchronisation requests merely require the command + <command>task sync</command> after that stage. + </para> + </section> + <section> + <title>Manual CA management</title> + + <para> + If you set any options within + <option>service.taskserver.pki.manual.*</option>, the automatic user and + CA management by the <command>nixos-taskserver</command> is disabled and + you need to create certificates and keys by yourself. + </para> + </section> +</chapter> diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py new file mode 100644 index 0000000000000..03e7cdf8987a7 --- /dev/null +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -0,0 +1,673 @@ +import grp +import json +import pwd +import os +import re +import string +import subprocess +import sys + +from contextlib import contextmanager +from shutil import rmtree +from tempfile import NamedTemporaryFile + +import click + +CERTTOOL_COMMAND = "@certtool@" +CERT_BITS = "@certBits@" +CLIENT_EXPIRATION = "@clientExpiration@" +CRL_EXPIRATION = "@crlExpiration@" + +TASKD_COMMAND = "@taskd@" +TASKD_DATA_DIR = "@dataDir@" +TASKD_USER = "@user@" +TASKD_GROUP = "@group@" +FQDN = "@fqdn@" + +CA_KEY = os.path.join(TASKD_DATA_DIR, "keys", "ca.key") +CA_CERT = os.path.join(TASKD_DATA_DIR, "keys", "ca.cert") +CRL_FILE = os.path.join(TASKD_DATA_DIR, "keys", "server.crl") + +RE_CONFIGUSER = re.compile(r'^\s*user\s*=(.*)$') +RE_USERKEY = re.compile(r'New user key: (.+)$', re.MULTILINE) + + +def lazyprop(fun): + """ + Decorator which only evaluates the specified function when accessed. + """ + name = '_lazy_' + fun.__name__ + + @property + def _lazy(self): + val = getattr(self, name, None) + if val is None: + val = fun(self) + setattr(self, name, val) + return val + + return _lazy + + +class TaskdError(OSError): + pass + + +def run_as_taskd_user(): + uid = pwd.getpwnam(TASKD_USER).pw_uid + gid = grp.getgrnam(TASKD_GROUP).gr_gid + os.setgid(gid) + os.setuid(uid) + + +def taskd_cmd(cmd, *args, **kwargs): + """ + Invoke taskd with the specified command with the privileges of the 'taskd' + user and 'taskd' group. + + If 'capture_stdout' is passed as a keyword argument with the value True, + the return value are the contents the command printed to stdout. + """ + capture_stdout = kwargs.pop("capture_stdout", False) + fun = subprocess.check_output if capture_stdout else subprocess.check_call + return fun( + [TASKD_COMMAND, cmd, "--data", TASKD_DATA_DIR] + list(args), + preexec_fn=run_as_taskd_user, + **kwargs + ) + + +def certtool_cmd(*args, **kwargs): + """ + Invoke certtool from GNUTLS and return the output of the command. + + The provided arguments are added to the certtool command and keyword + arguments are added to subprocess.check_output(). + + Note that this will suppress all output of certtool and it will only be + printed whenever there is an unsuccessful return code. + """ + return subprocess.check_output( + [CERTTOOL_COMMAND] + list(args), + preexec_fn=lambda: os.umask(0077), + stderr=subprocess.STDOUT, + **kwargs + ) + + +def label(msg): + if sys.stdout.isatty() or sys.stderr.isatty(): + sys.stderr.write(msg + "\n") + + +def mkpath(*args): + return os.path.join(TASKD_DATA_DIR, "orgs", *args) + + +def mark_imperative(*path): + """ + Mark the specified path as being imperatively managed by creating an empty + file called ".imperative", so that it doesn't interfere with the + declarative configuration. + """ + open(os.path.join(mkpath(*path), ".imperative"), 'a').close() + + +def is_imperative(*path): + """ + Check whether the given path is marked as imperative, see mark_imperative() + for more information. + """ + full_path = [] + for component in path: + full_path.append(component) + if os.path.exists(os.path.join(mkpath(*full_path), ".imperative")): + return True + return False + + +def fetch_username(org, key): + for line in open(mkpath(org, "users", key, "config"), "r"): + match = RE_CONFIGUSER.match(line) + if match is None: + continue + return match.group(1).strip() + return None + + +@contextmanager +def create_template(contents): + """ + Generate a temporary file with the specified contents as a list of strings + and yield its path as the context. + """ + template = NamedTemporaryFile(mode="w", prefix="certtool-template") + template.writelines(map(lambda l: l + "\n", contents)) + template.flush() + yield template.name + template.close() + + +def generate_key(org, user): + basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) + if os.path.exists(basedir): + raise OSError("Keyfile directory for {} already exists.".format(user)) + + privkey = os.path.join(basedir, "private.key") + pubcert = os.path.join(basedir, "public.cert") + + try: + os.makedirs(basedir, mode=0700) + + certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey) + + template_data = [ + "organization = {0}".format(org), + "cn = {}".format(FQDN), + "expiration_days = {}".format(CLIENT_EXPIRATION), + "tls_www_client", + "encryption_key", + "signing_key" + ] + + with create_template(template_data) as template: + certtool_cmd( + "-c", + "--load-privkey", privkey, + "--load-ca-privkey", CA_KEY, + "--load-ca-certificate", CA_CERT, + "--template", template, + "--outfile", pubcert + ) + except: + rmtree(basedir) + raise + + +def revoke_key(org, user): + basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) + if not os.path.exists(basedir): + raise OSError("Keyfile directory for {} doesn't exist.".format(user)) + + pubcert = os.path.join(basedir, "public.cert") + + expiration = "expiration_days = {}".format(CRL_EXPIRATION) + + with create_template([expiration]) as template: + oldcrl = NamedTemporaryFile(mode="wb", prefix="old-crl") + oldcrl.write(open(CRL_FILE, "rb").read()) + oldcrl.flush() + certtool_cmd( + "--generate-crl", + "--load-crl", oldcrl.name, + "--load-ca-privkey", CA_KEY, + "--load-ca-certificate", CA_CERT, + "--load-certificate", pubcert, + "--template", template, + "--outfile", CRL_FILE + ) + oldcrl.close() + rmtree(basedir) + + +def is_key_line(line, match): + return line.startswith("---") and line.lstrip("- ").startswith(match) + + +def getkey(*args): + path = os.path.join(TASKD_DATA_DIR, "keys", *args) + buf = [] + for line in open(path, "r"): + if len(buf) == 0: + if is_key_line(line, "BEGIN"): + buf.append(line) + continue + + buf.append(line) + + if is_key_line(line, "END"): + return ''.join(buf) + raise IOError("Unable to get key from {}.".format(path)) + + +def mktaskkey(cfg, path, keydata): + heredoc = 'cat > "{}" <<EOF\n{}EOF'.format(path, keydata) + cmd = 'task config taskd.{} -- "{}"'.format(cfg, path) + return heredoc + "\n" + cmd + + +class User(object): + def __init__(self, org, name, key): + self.__org = org + self.name = name + self.key = key + + def export(self): + pubcert = getkey(self.__org, self.name, "public.cert") + privkey = getkey(self.__org, self.name, "private.key") + cacert = getkey("ca.cert") + + keydir = "${TASKDATA:-$HOME/.task}/keys" + + credentials = '/'.join([self.__org, self.name, self.key]) + allow_unquoted = string.ascii_letters + string.digits + "/-_." + if not all((c in allow_unquoted) for c in credentials): + credentials = "'" + credentials.replace("'", r"'\''") + "'" + + script = [ + "umask 0077", + 'mkdir -p "{}"'.format(keydir), + mktaskkey("certificate", os.path.join(keydir, "public.cert"), + pubcert), + mktaskkey("key", os.path.join(keydir, "private.key"), privkey), + mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert), + "task config taskd.credentials -- {}".format(credentials) + ] + + return "\n".join(script) + "\n" + + +class Group(object): + def __init__(self, org, name): + self.__org = org + self.name = name + + +class Organisation(object): + def __init__(self, name, ignore_imperative): + self.name = name + self.ignore_imperative = ignore_imperative + + def add_user(self, name): + """ + Create a new user along with a certificate and key. + + Returns a 'User' object or None if the user already exists. + """ + if self.ignore_imperative and is_imperative(self.name): + return None + if name not in self.users.keys(): + output = taskd_cmd("add", "user", self.name, name, + capture_stdout=True) + key = RE_USERKEY.search(output) + if key is None: + msg = "Unable to find key while creating user {}." + raise TaskdError(msg.format(name)) + + generate_key(self.name, name) + newuser = User(self.name, name, key.group(1)) + self._lazy_users[name] = newuser + return newuser + return None + + def del_user(self, name): + """ + Delete a user and revoke its keys. + """ + if name in self.users.keys(): + user = self.get_user(name) + if self.ignore_imperative and \ + is_imperative(self.name, "users", user.key): + return + + # Work around https://bug.tasktools.org/browse/TD-40: + rmtree(mkpath(self.name, "users", user.key)) + + revoke_key(self.name, name) + del self._lazy_users[name] + + def add_group(self, name): + """ + Create a new group. + + Returns a 'Group' object or None if the group already exists. + """ + if self.ignore_imperative and is_imperative(self.name): + return None + if name not in self.groups.keys(): + taskd_cmd("add", "group", self.name, name) + newgroup = Group(self.name, name) + self._lazy_groups[name] = newgroup + return newgroup + return None + + def del_group(self, name): + """ + Delete a group. + """ + if name in self.users.keys(): + if self.ignore_imperative and \ + is_imperative(self.name, "groups", name): + return + taskd_cmd("remove", "group", self.name, name) + del self._lazy_groups[name] + + def get_user(self, name): + return self.users.get(name) + + @lazyprop + def users(self): + result = {} + for key in os.listdir(mkpath(self.name, "users")): + user = fetch_username(self.name, key) + if user is not None: + result[user] = User(self.name, user, key) + return result + + def get_group(self, name): + return self.groups.get(name) + + @lazyprop + def groups(self): + result = {} + for group in os.listdir(mkpath(self.name, "groups")): + result[group] = Group(self.name, group) + return result + + +class Manager(object): + def __init__(self, ignore_imperative=False): + """ + Instantiates an organisations manager. + + If ignore_imperative is True, all actions that modify data are checked + whether they're created imperatively and if so, they will result in no + operation. + """ + self.ignore_imperative = ignore_imperative + + def add_org(self, name): + """ + Create a new organisation. + + Returns an 'Organisation' object or None if the organisation already + exists. + """ + if name not in self.orgs.keys(): + taskd_cmd("add", "org", name) + neworg = Organisation(name, self.ignore_imperative) + self._lazy_orgs[name] = neworg + return neworg + return None + + def del_org(self, name): + """ + Delete and revoke keys of an organisation with all its users and + groups. + """ + org = self.get_org(name) + if org is not None: + if self.ignore_imperative and is_imperative(name): + return + for user in org.users.keys(): + org.del_user(user) + for group in org.groups.keys(): + org.del_group(group) + taskd_cmd("remove", "org", name) + del self._lazy_orgs[name] + + def get_org(self, name): + return self.orgs.get(name) + + @lazyprop + def orgs(self): + result = {} + for org in os.listdir(mkpath()): + result[org] = Organisation(org, self.ignore_imperative) + return result + + +class OrganisationType(click.ParamType): + name = 'organisation' + + def convert(self, value, param, ctx): + org = Manager().get_org(value) + if org is None: + self.fail("Organisation {} does not exist.".format(value)) + return org + +ORGANISATION = OrganisationType() + + +@click.group() +@click.pass_context +def cli(ctx): + """ + Manage Taskserver users and certificates + """ + for path in (CA_KEY, CA_CERT, CRL_FILE): + if not os.path.exists(path): + msg = "CA setup not done or incomplete, missing file {}." + ctx.fail(msg.format(path)) + + +@cli.group("org") +def org_cli(): + """ + Manage organisations + """ + pass + + +@cli.group("user") +def user_cli(): + """ + Manage users + """ + pass + + +@cli.group("group") +def group_cli(): + """ + Manage groups + """ + pass + + +@user_cli.command("list") +@click.argument("organisation", type=ORGANISATION) +def list_users(organisation): + """ + List all users belonging to the specified organisation. + """ + label("The following users exists for {}:".format(organisation.name)) + for user in organisation.users.values(): + sys.stdout.write(user.name + "\n") + + +@group_cli.command("list") +@click.argument("organisation", type=ORGANISATION) +def list_groups(organisation): + """ + List all users belonging to the specified organisation. + """ + label("The following users exists for {}:".format(organisation.name)) + for group in organisation.groups.values(): + sys.stdout.write(group.name + "\n") + + +@org_cli.command("list") +def list_orgs(): + """ + List available organisations + """ + label("The following organisations exist:") + for org in Manager().orgs: + sys.stdout.write(org.name + "\n") + + +@user_cli.command("getkey") +@click.argument("organisation", type=ORGANISATION) +@click.argument("user") +def get_uuid(organisation, user): + """ + Get the UUID of the specified user belonging to the specified organisation. + """ + userobj = organisation.get_user(user) + if userobj is None: + msg = "User {} doesn't exist in organisation {}." + sys.exit(msg.format(userobj.name, organisation.name)) + + label("User {} has the following UUID:".format(userobj.name)) + sys.stdout.write(user.key + "\n") + + +@user_cli.command("export") +@click.argument("organisation", type=ORGANISATION) +@click.argument("user") +def export_user(organisation, user): + """ + Export user of the specified organisation as a series of shell commands + that can be used on the client side to easily import the certificates. + + Note that the private key will be exported as well, so use this with care! + """ + userobj = organisation.get_user(user) + if userobj is None: + msg = "User {} doesn't exist in organisation {}." + sys.exit(msg.format(userobj.name, organisation.name)) + + sys.stdout.write(userobj.export()) + + +@org_cli.command("add") +@click.argument("name") +def add_org(name): + """ + Create an organisation with the specified name. + """ + if os.path.exists(mkpath(name)): + msg = "Organisation with name {} already exists." + sys.exit(msg.format(name)) + + taskd_cmd("add", "org", name) + mark_imperative(name) + + +@org_cli.command("remove") +@click.argument("name") +def del_org(name): + """ + Delete the organisation with the specified name. + + All of the users and groups will be deleted as well and client certificates + will be revoked. + """ + Manager().del_org(name) + msg = ("Organisation {} deleted. Be sure to restart the Taskserver" + " using 'systemctl restart taskserver.service' in order for" + " the certificate revocation to apply.") + click.echo(msg.format(name), err=True) + + +@user_cli.command("add") +@click.argument("organisation", type=ORGANISATION) +@click.argument("user") +def add_user(organisation, user): + """ + Create a user for the given organisation along with a client certificate + and print the key of the new user. + + The client certificate along with it's public key can be shown via the + 'user export' subcommand. + """ + userobj = organisation.add_user(user) + if userobj is None: + msg = "User {} already exists in organisation {}." + sys.exit(msg.format(user, organisation)) + else: + mark_imperative(organisation.name, "users", userobj.key) + + +@user_cli.command("remove") +@click.argument("organisation", type=ORGANISATION) +@click.argument("user") +def del_user(organisation, user): + """ + Delete a user from the given organisation. + + This will also revoke the client certificate of the given user. + """ + organisation.del_user(user) + msg = ("User {} deleted. Be sure to restart the Taskserver using" + " 'systemctl restart taskserver.service' in order for the" + " certificate revocation to apply.") + click.echo(msg.format(user), err=True) + + +@group_cli.command("add") +@click.argument("organisation", type=ORGANISATION) +@click.argument("group") +def add_group(organisation, group): + """ + Create a group for the given organisation. + """ + groupobj = organisation.add_group(group) + if groupobj is None: + msg = "Group {} already exists in organisation {}." + sys.exit(msg.format(group, organisation)) + else: + mark_imperative(organisation.name, "groups", groupobj.name) + + +@group_cli.command("remove") +@click.argument("organisation", type=ORGANISATION) +@click.argument("group") +def del_group(organisation, group): + """ + Delete a group from the given organisation. + """ + organisation.del_group(group) + click("Group {} deleted.".format(group), err=True) + + +def add_or_delete(old, new, add_fun, del_fun): + """ + Given an 'old' and 'new' list, figure out the intersections and invoke + 'add_fun' against every element that is not in the 'old' list and 'del_fun' + against every element that is not in the 'new' list. + + Returns a tuple where the first element is the list of elements that were + added and the second element consisting of elements that were deleted. + """ + old_set = set(old) + new_set = set(new) + to_delete = old_set - new_set + to_add = new_set - old_set + for elem in to_delete: + del_fun(elem) + for elem in to_add: + add_fun(elem) + return to_add, to_delete + + +@cli.command("process-json") +@click.argument('json-file', type=click.File('rb')) +def process_json(json_file): + """ + Create and delete users, groups and organisations based on a JSON file. + + The structure of this file is exactly the same as the + 'services.taskserver.organisations' option of the NixOS module and is used + for declaratively adding and deleting users. + + Hence this subcommand is not recommended outside of the scope of the NixOS + module. + """ + data = json.load(json_file) + + mgr = Manager(ignore_imperative=True) + add_or_delete(mgr.orgs.keys(), data.keys(), mgr.add_org, mgr.del_org) + + for org in mgr.orgs.values(): + if is_imperative(org.name): + continue + add_or_delete(org.users.keys(), data[org.name]['users'], + org.add_user, org.del_user) + add_or_delete(org.groups.keys(), data[org.name]['groups'], + org.add_group, org.del_group) + + +if __name__ == '__main__': + cli() diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 425e0ee9230f9..a67df158be478 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -71,7 +71,7 @@ in { after = [ "network.target" "docker.service" "influxdb.service" ]; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do sleep 1; done ''; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 7104a5796f761..e50728aff8f89 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -509,7 +509,7 @@ in { }; in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index ab441339a560f..d4b6c05e94329 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -26,6 +26,15 @@ in The port on which the introducer will listen. ''; }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the introducer should listen on. + + If specified, the port should be included. + ''; + }; package = mkOption { default = pkgs.tahoelafs; defaultText = "pkgs.tahoelafs"; @@ -60,6 +69,18 @@ in system to listen on a different port. ''; }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the node should listen on. + + This is the setting to tweak if there are multiple interfaces + and you want to alter which interface Tahoe is advertising. + + If specified, the port should be included. + ''; + }; web.port = mkOption { default = 3456; type = types.int; @@ -144,6 +165,8 @@ in [node] nickname = ${settings.nickname} tub.port = ${toString settings.tub.port} + ${optionalString (settings.tub.location != null) + "tub.location = ${settings.tub.location}"} ''; }); # Actually require Tahoe, so that we will have it installed. @@ -209,6 +232,8 @@ in [node] nickname = ${settings.nickname} tub.port = ${toString settings.tub.port} + ${optionalString (settings.tub.location != null) + "tub.location = ${settings.tub.location}"} # This is a Twisted endpoint. Twisted Web doesn't work on # non-TCP. ~ C. web.port = tcp:${toString settings.web.port} diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix index 648097274641c..8bc37f0f62c37 100644 --- a/nixos/modules/services/network-filesystems/u9fs.nix +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -27,10 +27,17 @@ in ''; }; + user = mkOption { + type = types.str; + default = "nobody"; + description = + "User to run u9fs under."; + }; + extraArgs = mkOption { type = types.str; default = ""; - example = "-a none -u nobody"; + example = "-a none"; description = '' Extra arguments to pass on invocation, @@ -38,13 +45,6 @@ in ''; }; - fsroot = mkOption { - type = types.path; - default = "/"; - example = "/srv"; - description = "File system root to serve to clients."; - }; - }; }; @@ -63,9 +63,10 @@ in reloadIfChanged = true; requires = [ "u9fs.socket" ]; serviceConfig = - { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}"; + { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs}"; StandardInput = "socket"; StandardError = "journal"; + User = cfg.user; }; }; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 886bfc30468e8..9e2b044821d6f 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -151,7 +151,7 @@ in /etc/group r, ${config.environment.etc."nsswitch.conf".source} r, - ${pkgs.glibc}/lib/*.so mr, + ${pkgs.glibc.out}/lib/*.so mr, ${pkgs.tzdata}/share/zoneinfo/** r, network inet stream, @@ -159,15 +159,15 @@ in network inet dgram, network inet6 dgram, - ${pkgs.gcc.cc}/lib/libssp.so.* mr, - ${pkgs.libsodium}/lib/libsodium.so.* mr, + ${pkgs.gcc.cc.lib}/lib/libssp.so.* mr, + ${pkgs.libsodium.out}/lib/libsodium.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.libcap}/lib/libcap.so.* mr, + ${pkgs.xz.out}/lib/liblzma.so.* mr, + ${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr, + ${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr, + ${pkgs.libcap.out}/lib/libcap.so.* mr, ${pkgs.lz4}/lib/liblz4.so.* mr, - ${pkgs.attr}/lib/libattr.so.* mr, + ${pkgs.attr.out}/lib/libattr.so.* mr, ${resolverListFile} r, } diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 15ec9be801217..0cbf57314c4b6 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/i2pd"; - extip = "EXTIP=\$(${pkgs.curl}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; + extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; toYesNo = b: if b then "yes" else "no"; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix new file mode 100644 index 0000000000000..1b0d2d9a517c8 --- /dev/null +++ b/nixos/modules/services/networking/iodine.nix @@ -0,0 +1,136 @@ +# NixOS module for iodine, ip over dns daemon + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.iodine; + + iodinedUser = "iodined"; + +in +{ + + ### configuration + + options = { + + services.iodine = { + clients = mkOption { + default = {}; + description = '' + Each attribute of this option defines a systemd service that + runs iodine. Many or none may be defined. + The name of each service is + <literal>iodine-<replaceable>name</replaceable></literal> + where <replaceable>name</replaceable> is the name of the + corresponding attribute name. + ''; + example = literalExample '' + { + foo = { + server = "tunnel.mdomain.com"; + relay = "8.8.8.8"; + extraConfig = "-P mysecurepassword"; + } + } + ''; + type = types.attrsOf (types.submodule ( + { + options = { + server = mkOption { + type = types.str; + default = ""; + description = "Domain or Subdomain of server running iodined"; + example = "tunnel.mydomain.com"; + }; + + relay = mkOption { + type = types.str; + default = ""; + description = "DNS server to use as a intermediate relay to the iodined server"; + example = "8.8.8.8"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + }; + }; + })); + }; + + server = { + enable = mkOption { + type = types.bool; + default = false; + description = "enable iodined server"; + }; + + ip = mkOption { + type = types.str; + default = ""; + description = "The assigned ip address or ip range"; + example = "172.16.10.1/24"; + }; + + domain = mkOption { + type = types.str; + default = ""; + description = "Domain or subdomain of which nameservers point to us"; + example = "tunnel.mydomain.com"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + }; + }; + + }; + }; + + ### implementation + + config = mkIf (cfg.server.enable || cfg.clients != {}) { + environment.systemPackages = [ pkgs.iodine ]; + boot.kernelModules = [ "tun" ]; + + systemd.services = + let + createIodineClientService = name: cfg: + { + description = "iodine client - ${name}"; + wantedBy = [ "ip-up.target" ]; + serviceConfig = { + RestartSec = "30s"; + Restart = "always"; + ExecStart = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.relay} ${cfg.server}"; + }; + }; + in + listToAttrs ( + mapAttrsToList + (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value)) + cfg.clients + ) // { + iodined = mkIf (cfg.server.enable) { + description = "iodine, ip over dns server daemon"; + wantedBy = [ "ip-up.target" ]; + serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}"; + }; + }; + + users.extraUsers = singleton { + name = iodinedUser; + uid = config.ids.uids.iodined; + description = "Iodine daemon user"; + }; + users.extraGroups.iodined.gid = config.ids.gids.iodined; + }; +} diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix deleted file mode 100644 index 20d371c4e2d1f..0000000000000 --- a/nixos/modules/services/networking/iodined.nix +++ /dev/null @@ -1,86 +0,0 @@ -# NixOS module for iodine, ip over dns daemon - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.iodined; - - iodinedUser = "iodined"; - -in - -{ - - ### configuration - - options = { - - services.iodined = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Enable iodine, ip over dns daemon"; - }; - - client = mkOption { - type = types.bool; - default = false; - description = "Start iodine in client mode"; - }; - - ip = mkOption { - type = types.str; - default = ""; - description = "Assigned ip address or ip range"; - example = "172.16.10.1/24"; - }; - - domain = mkOption { - type = types.str; - default = ""; - description = "Domain or subdomain of which nameservers point to us"; - example = "tunnel.mydomain.com"; - }; - - extraConfig = mkOption { - type = types.str; - default = ""; - description = "Additional command line parameters"; - example = "-P mysecurepassword -l 192.168.1.10 -p 23"; - }; - - }; - - }; - - ### implementation - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.iodine ]; - boot.kernelModules = [ "tun" ]; - - systemd.services.iodined = { - description = "iodine, ip over dns daemon"; - wantedBy = [ "ip-up.target" ]; - serviceConfig.ExecStart = "${pkgs.iodine}/sbin/iodined -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.ip} ${cfg.domain}"; - }; - - - users.extraUsers = singleton { - name = iodinedUser; - uid = config.ids.uids.iodined; - description = "Iodine daemon user"; - }; - users.extraGroups.iodined.gid = config.ids.gids.iodined; - - assertions = [{ assertion = if !cfg.client then cfg.ip != "" else true; - message = "cannot start iodined without ip set";} - { assertion = cfg.domain != ""; - message = "cannot start iodined without domain name set";}]; - - }; - -} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index aa28502a12c4d..61d063dbfe0e8 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -58,9 +58,9 @@ in services.minidlna.config = '' port=${toString port} - friendly_name=NixOS Media Server + friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_dir=/var/log/minidlna + log_level=warn inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -83,21 +83,18 @@ in preStart = '' - mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna - chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna + mkdir -p /var/cache/minidlna + chown -R minidlna:minidlna /var/cache/minidlna ''; - # FIXME: log through the journal rather than - # /var/log/minidlna. The -d flag does that, but also raises - # the log level to debug... serviceConfig = { User = "minidlna"; - Group = "nogroup"; + Group = "minidlna"; PermissionsStartOnly = true; - Type = "forking"; + RuntimeDirectory = "minidlna"; PIDFile = "/run/minidlna/pid"; ExecStart = - "@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" + + "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" + " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 880a1d361dfeb..8f6881441cf79 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -50,7 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ config.nix.package pkgs.bzip2 ]; + path = [ config.nix.package pkgs.bzip2.bin ]; environment.NIX_REMOTE = "daemon"; environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index cfa662c7311b4..dca8ccac76276 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -224,7 +224,7 @@ in serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}"; preStart = '' if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then - ${pkgs.openssl}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \ + ${pkgs.openssl.bin}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \ -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout ${cfg.sslKey} -out ${cfg.sslCert}; fi ''; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index f069fe7bec965..3664c28577397 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -6,6 +6,21 @@ let cfg = config.services.shout; shoutHome = "/var/lib/shout"; + defaultConfig = pkgs.runCommand "config.js" {} '' + EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD + mv config.js $out + ''; + + finalConfigFile = if (cfg.configFile != null) then cfg.configFile else '' + var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash') + + module.exports = _.merge( + {}, + require('${defaultConfig}'), + ${builtins.toJSON cfg.config} + ) + ''; + in { options.services.shout = { enable = mkEnableOption "Shout web IRC client"; @@ -35,8 +50,31 @@ in { type = types.nullOr types.lines; default = null; description = '' - Contents of Shout's <filename>config.js</filename> file. If left empty, - Shout will generate from its defaults at first startup. + Contents of Shout's <filename>config.js</filename> file. + + Used for backward compatibility, recommended way is now to use + the <literal>config</literal> option. + + Documentation: http://shout-irc.com/docs/server/configuration.html + ''; + }; + + config = mkOption { + default = {}; + type = types.attrs; + example = { + displayNetwork = false; + defaults = { + name = "Your Network"; + host = "localhost"; + port = 6697; + }; + }; + description = '' + Shout <filename>config.js</filename> contents as attribute set (will be + converted to JSON to generate the configuration file). + + The options defined here will be merged to the default configuration file. Documentation: http://shout-irc.com/docs/server/configuration.html ''; @@ -57,11 +95,7 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - preStart = if isNull cfg.configFile then "" - else '' - ln -sf ${pkgs.writeText "config.js" cfg.configFile} \ - ${shoutHome}/config.js - ''; + preStart = "ln -sf ${pkgs.writeText "config.js" finalConfigFile} ${shoutHome}/config.js"; script = concatStringsSep " " [ "${pkgs.shout}/bin/shout" (if cfg.private then "--private" else "--public") diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index da9a270f30b69..514c17c6e5d27 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -7,6 +7,21 @@ let cfg = config.services.syncthing; defaultUser = "syncthing"; + header = { + description = "Syncthing service"; + environment = { + STNORESTART = "yes"; + STNOUPGRADE = "yes"; + inherit (cfg) all_proxy; + } // config.networking.proxy.envVars; + }; + + service = { + Restart = "on-failure"; + SuccessExitStatus = "2 3 4"; + RestartForceExitStatus="3 4"; + }; + in { @@ -17,22 +32,33 @@ in services.syncthing = { - enable = mkOption { + enable = mkEnableOption '' + Syncthing - the self-hosted open-source alternative + to Dropbox and Bittorrent Sync. Initial interface will be + available on http://127.0.0.1:8384/. + ''; + + systemService = mkOption { type = types.bool; - default = false; - description = '' - Whether to enable the Syncthing, self-hosted open-source alternative - to Dropbox and BittorrentSync. Initial interface will be - available on http://127.0.0.1:8384/. - ''; + default = true; + description = "Auto launch Syncthing as a system service."; }; user = mkOption { type = types.string; default = defaultUser; description = '' - Syncthing will be run under this user (user must exist, - this can be your user name). + Syncthing will be run under this user (user will be created if it doesn't exist. + This can be your user name). + ''; + }; + + group = mkOption { + type = types.string; + default = "nogroup"; + description = '' + Syncthing will be run under this group (group will not be created if it doesn't exist. + This can be your user name). ''; }; @@ -64,10 +90,7 @@ in Syncthing package to use. ''; }; - - }; - }; @@ -77,7 +100,7 @@ in users = mkIf (cfg.user == defaultUser) { extraUsers."${defaultUser}" = - { group = defaultUser; + { group = cfg.group; home = cfg.dataDir; createHome = true; uid = config.ids.uids.syncthing; @@ -88,30 +111,27 @@ in config.ids.gids.syncthing; }; - systemd.services.syncthing = - { - description = "Syncthing service"; - after = [ "network.target" ]; + environment.systemPackages = [ cfg.package ]; + + systemd.services = mkIf cfg.systemService { + syncthing = header // { + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment = { - STNORESTART = "yes"; # do not self-restart - STNOUPGRADE = "yes"; - inherit (cfg) all_proxy; - } // config.networking.proxy.envVars; - - serviceConfig = { - User = cfg.user; - Group = optionalString (cfg.user == defaultUser) defaultUser; + serviceConfig = service // { + User = cfg.user; + Group = cfg.group; PermissionsStartOnly = true; - Restart = "on-failure"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; - SuccessExitStatus = "2 3 4"; - RestartForceExitStatus="3 4"; }; }; + }; - environment.systemPackages = [ cfg.package ]; - + systemd.user.services = { + syncthing = header // { + serviceConfig = service // { + ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser"; + }; + }; + }; }; - } diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 9e122dc7beac2..0bcb1a0c20c4d 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -14,27 +14,27 @@ let additionalBackends = pkgs.runCommand "additional-cups-backends" { } '' mkdir -p $out - if [ ! -e ${cups}/lib/cups/backend/smb ]; then + if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then mkdir -p $out/lib/cups/backend ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb fi # Provide support for printing via HTTPS. - if [ ! -e ${cups}/lib/cups/backend/https ]; then + if [ ! -e ${cups.out}/lib/cups/backend/https ]; then mkdir -p $out/lib/cups/backend - ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https + ln -sv ${cups.out}/lib/cups/backend/ipp $out/lib/cups/backend/https fi ''; # Here we can enable additional backends, filters, etc. that are not # part of CUPS itself, e.g. the SMB backend is part of Samba. Since - # we can't update ${cups}/lib/cups itself, we create a symlink tree + # we can't update ${cups.out}/lib/cups itself, we create a symlink tree # here and add the additional programs. The ServerBin directive in # cupsd.conf tells cupsd to use this tree. bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups additionalBackends cups_filters pkgs.ghostscript ] + [ cups.out additionalBackends cups_filters pkgs.ghostscript ] ++ optional cfg.gutenprint gutenprint ++ cfg.drivers; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; @@ -267,24 +267,24 @@ in description = "CUPS printing services"; }; - environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper; + environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; environment.etc."cups".source = "/var/lib/cups"; - services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper; + services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; # Cups uses libusb to talk to printers, and does not use the # linux kernel driver. If the driver is not in a black list, it # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.packages = [ cups ]; + systemd.packages = [ cups.out ]; systemd.services.cups = { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; - path = [ cups ]; + path = [ cups.out ]; preStart = '' diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 31332489a7841..c51a42b8e9c1f 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -148,7 +148,7 @@ in { if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do sleep 1 done ''; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index ba34eb25169cc..2e29ef6a8f537 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -121,7 +121,7 @@ in security.setuidOwners = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; @@ -139,30 +139,6 @@ in systemd.services.dbus.restartTriggers = [ configDir ]; - systemd.user = { - services.dbus = { - description = "D-Bus User Message Bus"; - requires = [ "dbus.socket" ]; - # NixOS doesn't support "Also" so we pull it in manually - # As the .service is supposed to come up at the same time as - # the .socket, we use basic.target instead of default.target - wantedBy = [ "basic.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dbus_daemon}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation"; - ExecReload = "${pkgs.dbus_daemon}/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig"; - }; - }; - - sockets.dbus = { - description = "D-Bus User Message Bus Socket"; - socketConfig = { - ListenStream = "%t/bus"; - ExecStartPost = "-${config.systemd.package}/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus"; - }; - wantedBy = [ "sockets.target" ]; - }; - }; - environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; }; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 3c0d2043ed5d5..d98ef8a306d57 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -64,14 +64,14 @@ in restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ]; serviceConfig = - { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}"; + { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}"; Type = "forking"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ "${pkgs.glibc}/sbin/nscd --invalidate passwd" - "${pkgs.glibc}/sbin/nscd --invalidate group" - "${pkgs.glibc}/sbin/nscd --invalidate hosts" + [ "${pkgs.glibc.bin}/sbin/nscd --invalidate passwd" + "${pkgs.glibc.bin}/sbin/nscd --invalidate group" + "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts" ]; }; @@ -79,7 +79,7 @@ in # its pid. So wait until it's ready. postStart = '' - while ! ${pkgs.glibc}/sbin/nscd -g -f ${cfgFile} > /dev/null; do + while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do sleep 0.2 done ''; diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix new file mode 100644 index 0000000000000..1252aa1c549c7 --- /dev/null +++ b/nixos/modules/services/torrent/flexget.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, timezone, ... }: + +with lib; + +let + cfg = config.services.flexget; + pkg = pkgs.python27Packages.flexget; + ymlFile = pkgs.writeText "flexget.yml" '' + ${cfg.config} + + ${optionalString cfg.systemScheduler "schedules: no"} +''; + configFile = "${toString cfg.homeDir}/flexget.yml"; +in { + options = { + services.flexget = { + enable = mkEnableOption "Run FlexGet Daemon"; + + user = mkOption { + default = "deluge"; + example = "some_user"; + type = types.string; + description = "The user under which to run flexget."; + }; + + homeDir = mkOption { + default = "/var/lib/deluge"; + example = "/home/flexget"; + type = types.path; + description = "Where files live."; + }; + + interval = mkOption { + default = "10m"; + example = "1h"; + type = types.string; + description = "When to perform a <command>flexget</command> run. See <command>man 7 systemd.time</command> for the format."; + }; + + systemScheduler = mkOption { + default = true; + example = "false"; + type = types.bool; + description = "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file."; + }; + + config = mkOption { + default = ""; + type = types.lines; + description = "The YAML configuration for FlexGet."; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.python27Packages.flexget ]; + + systemd.services = { + flexget = { + description = "FlexGet Daemon"; + path = [ pkgs.pythonPackages.flexget ]; + serviceConfig = { + User = cfg.user; + Environment = "TZ=${config.time.timeZone}"; + ExecStartPre = "${pkgs.coreutils}/bin/install -m644 ${ymlFile} ${configFile}"; + ExecStart = "${pkg}/bin/flexget -c ${configFile} daemon start"; + ExecStop = "${pkg}/bin/flexget -c ${configFile} daemon stop"; + ExecReload = "${pkg}/bin/flexget -c ${configFile} daemon reload"; + Restart = "on-failure"; + PrivateTmp = true; + WorkingDirectory = toString cfg.homeDir; + }; + wantedBy = [ "multi-user.target" ]; + }; + + flexget-runner = mkIf cfg.systemScheduler { + description = "FlexGet Runner"; + after = [ "flexget.service" ]; + wants = [ "flexget.service" ]; + serviceConfig = { + User = cfg.user; + ExecStart = "${pkg}/bin/flexget -c ${configFile} execute"; + PrivateTmp = true; + WorkingDirectory = toString cfg.homeDir; + }; + }; + }; + + systemd.timers.flexget-runner = mkIf cfg.systemScheduler { + description = "Run FlexGet every ${cfg.interval}"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "5m"; + OnUnitInactiveSec = cfg.interval; + Unit = "flexget-runner.service"; + }; + }; + }; +} diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 7718a721763cb..c2220cb0cff7a 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,21 +113,21 @@ in #include <abstractions/base> #include <abstractions/nameservice> - ${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.glibc.out}/lib/*.so mr, + ${pkgs.libevent.out}/lib/libevent*.so* mr, + ${pkgs.curl.out}/lib/libcurl*.so* mr, + ${pkgs.openssl.out}/lib/libssl*.so* mr, + ${pkgs.openssl.out}/lib/libcrypto*.so* mr, + ${pkgs.zlib.out}/lib/libz*.so* mr, + ${pkgs.libssh2.out}/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, + ${pkgs.xz.out}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr, + ${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr, + ${pkgs.libnghttp2.out}/lib/libnghttp2*.so* mr, + ${pkgs.c-ares.out}/lib/libcares*.so* mr, + ${pkgs.libcap.out}/lib/libcap*.so* mr, + ${pkgs.attr.out}/lib/libattr*.so* mr, ${pkgs.lz4}/lib/liblz4*.so* mr, @{PROC}/sys/kernel/random/uuid r, diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index fdbd61c85e653..7953729c00cd8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -6,13 +6,13 @@ let mainCfg = config.services.httpd; - httpd = mainCfg.package; + httpd = mainCfg.package.out; version24 = !versionOlder httpd.version "2.4"; httpdConf = mainCfg.configFile; - php = pkgs.php.override { apacheHttpd = httpd; }; + php = pkgs.php.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index a9ec20ae84716..94e85f1f42890 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -333,7 +333,7 @@ let 'version' => '${config.package.version}', - 'openssl' => '${pkgs.openssl}/bin/openssl' + 'openssl' => '${pkgs.openssl.bin}/bin/openssl' ); diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix index e4e3aac8d411a..efd4a7b5f0fb9 100644 --- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix +++ b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix @@ -39,7 +39,7 @@ in { "${pkgs.diffutils}" ] ++ (if config.mercurial then ["${pkgs.mercurial}"] else []) ++ - (if config.subversion then ["${pkgs.subversion}"] else []) ++ + (if config.subversion then ["${pkgs.subversion.out}"] else []) ++ (if config.git then ["${pkgs.git}"] else []); startupScript = pkgs.writeScript "activatePhabricator" '' diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index c5c11029010e3..c4aa6b6ad3a38 100644 --- a/nixos/modules/services/web-servers/apache-httpd/trac.nix +++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix @@ -96,7 +96,7 @@ in globalEnvVars = singleton { name = "PYTHONPATH"; value = - makeSearchPath "lib/${pkgs.python.libPrefix}/site-packages" + makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"] [ pkgs.mod_python pkgs.pythonPackages.trac pkgs.setuptools diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix new file mode 100644 index 0000000000000..0d2612aaa66bd --- /dev/null +++ b/nixos/modules/services/web-servers/caddy.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.caddy; + configFile = pkgs.writeText "Caddyfile" cfg.config; +in +{ + options.services.caddy = { + enable = mkEnableOption "Caddy web server"; + + config = mkOption { + description = "Verbatim Caddyfile to use"; + }; + + email = mkOption { + default = ""; + type = types.string; + description = "Email address (for Let's Encrypt certificate)"; + }; + + dataDir = mkOption { + default = "/var/lib/caddy"; + type = types.path; + description = "The data directory, for storing certificates."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.caddy = { + description = "Caddy web server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.caddy}/bin/caddy -conf=${configFile} -email=${cfg.email}"; + Type = "simple"; + User = "caddy"; + Group = "caddy"; + AmbientCapabilities = "cap_net_bind_service"; + }; + }; + + users.extraUsers.caddy = { + group = "caddy"; + uid = config.ids.uids.caddy; + home = cfg.dataDir; + createHome = true; + }; + + users.extraGroups.caddy.gid = config.ids.uids.caddy; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index c981b40f74a6a..11df7297833b6 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -7,7 +7,7 @@ let e = pkgs.enlightenment; xcfg = config.services.xserver; cfg = xcfg.desktopManager.enlightenment; - GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ + GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [ pkgs.gst_all_1.gst-plugins-base pkgs.gst_all_1.gst-plugins-good pkgs.gst_all_1.gst-plugins-bad diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index be7700424bc64..b112fc2422a76 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -166,7 +166,7 @@ in { }; environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" - "${gnome3.glib_networking}/lib/gio/modules" + "${gnome3.glib_networking.out}/lib/gio/modules" "${gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 71361bae82dc2..4f74d5732af55 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -62,13 +62,13 @@ in ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} - exec ${kde5.plasma-workspace}/bin/startkde + exec startkde ''; }; security.setuidOwners = singleton { program = "kcheckpass"; - source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass"; + source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; owner = "root"; group = "root"; setuid = true; @@ -171,12 +171,12 @@ in # Enable GTK applications to load SVG icons environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) { - GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; + GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }; fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; - programs.ssh.askPassword = "${kde5.ksshaskpass}/bin/ksshaskpass"; + programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; # Enable helpful DBus services. services.udisks2.enable = true; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 7dffdfc2b36cf..be634fc259a2b 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -45,7 +45,7 @@ let ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - exec ${pkgs.dbus.tools}/bin/dbus-launch --exit-with-session "$0" "$sessionType" + exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType" fi ''} @@ -55,11 +55,11 @@ let # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) - "${config.hardware.pulseaudio.package}/bin/pulseaudio --start" + "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start" } # Publish access credentials in the root window. - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" ''} # Tell systemd about our $DISPLAY. This is needed by the @@ -275,7 +275,7 @@ in }; config = { - services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X"; + services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; }; imports = [ diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index f5b6c20c5a05b..543dd628ce666 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -24,9 +24,9 @@ let # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --prefix PATH : "${pkgs.glibc}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GTK_PATH "${theme}:${pkgs.gtk3}" \ + --prefix PATH : "${pkgs.glibc.bin}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ --set GTK_EXE_PREFIX "${theme}" \ --set GTK_DATA_PREFIX "${theme}" \ --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 4d61afe0eaeb8..7a17a222bcab1 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -48,7 +48,7 @@ let [XDisplay] MinimumVT=${toString xcfg.tty} ServerPath=${xserverWrapper} - XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr + XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} SessionDir=${dmcfg.session.desktops} XauthPath=${pkgs.xorg.xauth}/bin/xauth diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 4d5dbd604159c..09d0ab0775150 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -41,7 +41,7 @@ with lib; { description = "Terminal Server"; path = - [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + [ pkgs.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]; diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 3e5229be634f1..2957ad91be453 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -20,7 +20,7 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/ + env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/ # !!! Hack: load the schemas for Metacity. GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \ --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 76431f2112439..dcf9f820f59c2 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -219,6 +219,12 @@ in ''; }; + dpi = mkOption { + type = types.nullOr types.int; + default = null; + description = "DPI resolution to use for X server."; + }; + startDbusSession = mkOption { type = types.bool; default = true; @@ -450,7 +456,7 @@ in ]); environment.systemPackages = - [ xorg.xorgserver + [ xorg.xorgserver.out xorg.xrandr xorg.xrdb xorg.setxkbmap @@ -460,6 +466,7 @@ in xorg.xsetroot xorg.xinput xorg.xprop + xorg.xauth pkgs.xterm pkgs.xdg_utils ] @@ -487,7 +494,7 @@ in XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ] + [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; @@ -507,18 +514,18 @@ in }; services.xserver.displayManager.xserverArgs = - [ "-ac" - "-terminate" + [ "-terminate" "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" + ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ] ++ optional (!cfg.enableTCP) "-nolisten tcp"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ - [ xorg.xorgserver + [ xorg.xorgserver.out xorg.xf86inputevdev ]; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 854fa2f40b692..9d61d64f7553a 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -12,7 +12,8 @@ let ''; }); - path = + path = map # outputs TODO? + (pkg: (pkg.bin or (pkg.out or pkg))) [ pkgs.coreutils pkgs.gnugrep pkgs.findutils pkgs.glibc # needed for getent pkgs.shadow diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix index 3d80da9e4571d..793c7515c761a 100644 --- a/nixos/modules/system/boot/coredump.nix +++ b/nixos/modules/system/boot/coredump.nix @@ -50,6 +50,11 @@ with lib; (mkIf (!config.systemd.coredump.enable) { boot.kernel.sysctl."kernel.core_pattern" = mkDefault "core"; + + systemd.extraConfig = + '' + DefaultLimitCORE=0:infinity + ''; }) ]; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 6b201fcce6383..0728db9864402 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,10 +55,10 @@ let version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; - path = (makeSearchPath "bin" ([ + path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) - )) + ":" + (makeSearchPath "sbin" [ + )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [ pkgs.mdadm pkgs.utillinux ]); }); diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 59bff5472e844..77a82547031a1 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -436,9 +436,9 @@ in ${optionalString luks.yubikeySupport '' copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo - copy_bin_and_libs ${pkgs.openssl}/bin/openssl + copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 copy_bin_and_libs pbkdf2-sha512 diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7b13a305f0355..5e6554324ca4a 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -31,7 +31,6 @@ let extraUtils = pkgs.runCommand "extra-utils" { buildInputs = [pkgs.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd - doublePatchelf = pkgs.stdenv.isArm; } '' set +o pipefail @@ -80,7 +79,7 @@ let ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly - cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib + cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib # Copy all of the needed libraries for the binaries for BIN in $(find $out/{bin,sbin} -type f); do @@ -111,9 +110,6 @@ let if ! test -L $i; then echo "patching $i..." patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true - if [ -n "$doublePatchelf" ]; then - patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true - fi fi done diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index c0ef4e02d1ffa..b67f42a017e69 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -7,11 +7,14 @@ let kernel = config.boot.kernelPackages.kernel; activateConfiguration = config.system.activationScripts.script; - readonlyMountpoint = pkgs.runCommand "readonly-mountpoint" {} '' - mkdir -p $out/bin - cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint - strip -s $out/bin/readonly-mountpoint - ''; + readonlyMountpoint = pkgs.stdenv.mkDerivation { + name = "readonly-mountpoint"; + unpackPhase = "true"; + installPhase = '' + mkdir -p $out/bin + cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint + ''; + }; bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index d4cab93b26b83..c8c9cda913c05 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -193,7 +193,7 @@ in rec { path = mkOption { default = []; - apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}"; + apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}"; description = '' Packages added to the service's <envar>PATH</envar> environment variable. Both the <filename>bin</filename> diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a3c83521c3549..3f497566ff117 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -472,6 +472,13 @@ in ''; }; + systemd.generator-packages = mkOption { + default = []; + type = types.listOf types.package; + example = literalExample "[ pkgs.systemd-cryptsetup-generator ]"; + description = "Packages providing systemd generators."; + }; + systemd.defaultUnit = mkOption { default = "multi-user.target"; type = types.str; @@ -628,7 +635,18 @@ in environment.systemPackages = [ systemd ]; - environment.etc = { + environment.etc = let + # generate contents for /etc/systemd/system-generators from + # systemd.generators and systemd.generator-packages + generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } '' + mkdir -p $out + for package in $packages + do + ln -s $package/lib/systemd/system-generators/* $out/ + done; + ${concatStrings (mapAttrsToList (generator: target: "ln -s ${target} $out/${generator};\n") cfg.generators)} + ''; + in ({ "systemd/system".source = generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants; "systemd/user".source = generateUnits "user" cfg.user.units upstreamUserUnits []; @@ -667,7 +685,9 @@ in ${concatStringsSep "\n" cfg.tmpfiles.rules} ''; - } // mapAttrs' (n: v: nameValuePair "systemd/system-generators/${n}" {"source"=v;}) cfg.generators; + + "systemd/system-generators" = { source = generators; }; + }); system.activationScripts.systemd = stringAfter [ "groups" ] '' diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index 3e38bffa3ba2c..1dcc4c87e3cec 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -18,9 +18,9 @@ boot.initrd.postDeviceCommands = '' # Hacky!!! fuse hard-codes the path to mount - mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin - ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin - ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin + mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin + ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin + ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin ''; }) diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix index d7c3930f4a3c0..c6a90bcf1a518 100644 --- a/nixos/modules/tasks/filesystems/xfs.nix +++ b/nixos/modules/tasks/filesystems/xfs.nix @@ -11,13 +11,13 @@ in { config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.xfsprogs ]; + system.fsPackages = [ pkgs.xfsprogs.bin ]; boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ]; boot.initrd.extraUtilsCommands = mkIf inInitrd '' - copy_bin_and_libs ${pkgs.xfsprogs}/sbin/fsck.xfs + copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs ''; # Trick just to set 'sh' after the extraUtils nuke-refs. diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index f4c42b1622064..19292bd1ef716 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -80,11 +80,8 @@ in description = '' Name of directory from which to import ZFS devices. - Usually /dev works. However, ZFS import may fail if a device node is renamed. - It should therefore use stable device names, such as from /dev/disk/by-id. - - The default remains /dev for 15.09, due to backwards compatibility concerns. - It will change to /dev/disk/by-id in the next NixOS release. + This should be a path under /dev containing stable names for all devices needed, as + import may fail if device nodes are renamed concurrently with a device failing. ''; }; diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index da97565fd6de2..a89cd454dc736 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -42,7 +42,7 @@ let wrapProgram "$out/bin/waagent" \ --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${makeSearchPath "bin" runtimeDeps}" + --prefix PATH : "${makeBinPath runtimeDeps}" ''; }; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index a025aee7cfeb6..3a10871ce8406 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -66,7 +66,7 @@ in services.xserver.displayManager.sessionCommands = '' - PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \ + PATH=${makeBinPath [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \ ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all ''; diff --git a/nixos/release.nix b/nixos/release.nix index 8a01b2685a78e..2bccef1fd34b7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -253,6 +253,7 @@ in rec { tests.sddm = callTest tests/sddm.nix {}; tests.sddm-kde5 = callTest tests/sddm-kde5.nix {}; tests.simple = callTest tests/simple.nix {}; + tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index 1644cb856cece..c55b08c0e9249 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... } : { services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; systemd.services.influxdb.postStart = mkAfter '' - ${pkgs.curl}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \ + ${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \ -d '{"name": "root"}' ''; }; diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index ded8275000af9..93aeb60e456af 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,9 +1,14 @@ { lib, ... }: -{ users.extraUsers = lib.singleton +{ users.extraUsers.alice = { isNormalUser = true; - name = "alice"; description = "Alice Foobar"; password = "foobar"; }; + + users.extraUsers.bob = + { isNormalUser = true; + description = "Bob Foobar"; + password = "foobar"; + }; } diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 1c07ddf79c2ee..42425b57ba330 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -32,6 +32,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/Terminal/); $machine->sleep(20); $machine->screenshot("screen"); diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 714b355037067..50e7f4eace3b5 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -27,6 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/Terminal/); $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); $machine->sleep(10); diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 627a150f641b9..4685992d7a053 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -13,6 +13,8 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = { nodes, ... }: '' $machine->waitForX; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/first configuration/); $machine->sleep(1); $machine->screenshot("started"); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 05c3f267eb931..48d5fecad9213 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -108,8 +108,8 @@ let $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev"); # Check whether the channel works. - $machine->succeed("nix-env -iA nixos.coreutils >&2"); - $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/ + $machine->succeed("nix-env -iA nixos.procps >&2"); + $machine->succeed("type -tP ps | tee /dev/stderr") =~ /.nix-profile/ or die "nix-env failed"; # We need to a writable nix-store on next boot. diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix index dc61658cd1c4f..2693fb4fbf0ae 100644 --- a/nixos/tests/kde4.nix +++ b/nixos/tests/kde4.nix @@ -41,11 +41,13 @@ import ./make-test.nix ({ pkgs, ... }: { pkgs.kde4.kdenetwork pkgs.kde4.kdetoys pkgs.kde4.kdewebdev + pkgs.xorg.xmessage ]; }; - testScript = '' + testScript = '' $machine->waitUntilSucceeds("pgrep plasma-desktop"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/plasma-desktop/); # Check that logging in has given the user ownership of devices. @@ -62,7 +64,7 @@ import ./make-test.nix ({ pkgs, ... }: { $machine->sleep(10); - $machine->screenshot("screen"); + $machine->screenshot("screen"); ''; }) diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index f30f9062dcded..97ec79406b884 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -22,6 +22,8 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForText(qr/${user.description}/); $machine->screenshot("lightdm"); $machine->sendChars("${user.password}\n"); + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow("^IceWM "); ''; }) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index b926a62194b45..cd4086cb8f62c 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -25,6 +25,8 @@ import ./make-test.nix ({ pkgs, ...} : { }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; security.sudo = { enable = true; wheelNeedsPassword = false; }; + security.hideProcessInformation = true; + users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; }; testScript = @@ -117,5 +119,12 @@ import ./make-test.nix ({ pkgs, ...} : { subtest "sudo", sub { $machine->succeed("su - sybil -c 'sudo true'"); }; + + # Test hidepid + subtest "hidepid", sub { + $machine->succeed("grep -Fq hidepid=2 /etc/mtab"); + $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]"); + $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]"); + }; ''; }) diff --git a/nixos/tests/sddm-kde5.nix b/nixos/tests/sddm-kde5.nix index 476cb732e252a..f97a6d12b63c6 100644 --- a/nixos/tests/sddm-kde5.nix +++ b/nixos/tests/sddm-kde5.nix @@ -24,6 +24,8 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = { nodes, ... }: '' startAll; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow("^IceWM "); ''; }) diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index e11b5714d5c28..22a9e1bd2c7c4 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -23,6 +23,8 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = { nodes, ... }: '' startAll; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow("^IceWM "); ''; }) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix new file mode 100644 index 0000000000000..d770b20a77575 --- /dev/null +++ b/nixos/tests/taskserver.nix @@ -0,0 +1,166 @@ +import ./make-test.nix { + name = "taskserver"; + + nodes = rec { + server = { + services.taskserver.enable = true; + services.taskserver.listenHost = "::"; + services.taskserver.fqdn = "server"; + services.taskserver.organisations = { + testOrganisation.users = [ "alice" "foo" ]; + anotherOrganisation.users = [ "bob" ]; + }; + }; + + client1 = { pkgs, ... }: { + environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ]; + users.users.alice.isNormalUser = true; + users.users.bob.isNormalUser = true; + users.users.foo.isNormalUser = true; + users.users.bar.isNormalUser = true; + }; + + client2 = client1; + }; + + testScript = { nodes, ... }: let + cfg = nodes.server.config.services.taskserver; + portStr = toString cfg.listenPort; + in '' + sub su ($$) { + my ($user, $cmd) = @_; + my $esc = $cmd =~ s/'/'\\${"'"}'/gr; + return "su - $user -c '$esc'"; + } + + sub setupClientsFor ($$) { + my ($org, $user) = @_; + + for my $client ($client1, $client2) { + $client->nest("initialize client for user $user", sub { + $client->succeed( + (su $user, "rm -rf /home/$user/.task"), + (su $user, "task rc.confirmation=no config confirmation no") + ); + + my $exportinfo = $server->succeed( + "nixos-taskserver user export $org $user" + ); + + $exportinfo =~ s/'/'\\'''/g; + + $client->nest("importing taskwarrior configuration", sub { + my $cmd = su $user, "eval '$exportinfo' >&2"; + my ($status, $out) = $client->execute_($cmd); + if ($status != 0) { + $client->log("output: $out"); + die "command `$cmd' did not succeed (exit code $status)\n"; + } + }); + + $client->succeed(su $user, + "task config taskd.server server:${portStr} >&2" + ); + + $client->succeed(su $user, "task sync init >&2"); + }); + } + } + + sub restartServer { + $server->succeed("systemctl restart taskserver.service"); + $server->waitForOpenPort(${portStr}); + } + + sub readdImperativeUser { + $server->nest("(re-)add imperative user bar", sub { + $server->execute("nixos-taskserver org remove imperativeOrg"); + $server->succeed( + "nixos-taskserver org add imperativeOrg", + "nixos-taskserver user add imperativeOrg bar" + ); + setupClientsFor "imperativeOrg", "bar"; + }); + } + + sub testSync ($) { + my $user = $_[0]; + subtest "sync for user $user", sub { + $client1->succeed(su $user, "task add foo >&2"); + $client1->succeed(su $user, "task sync >&2"); + $client2->fail(su $user, "task list >&2"); + $client2->succeed(su $user, "task sync >&2"); + $client2->succeed(su $user, "task list >&2"); + }; + } + + sub checkClientCert ($) { + my $user = $_[0]; + my $cmd = "gnutls-cli". + " --x509cafile=/home/$user/.task/keys/ca.cert". + " --x509keyfile=/home/$user/.task/keys/private.key". + " --x509certfile=/home/$user/.task/keys/public.cert". + " --port=${portStr} server < /dev/null"; + return su $user, $cmd; + } + + startAll; + + $server->waitForUnit("taskserver.service"); + + $server->succeed( + "nixos-taskserver user list testOrganisation | grep -qxF alice", + "nixos-taskserver user list testOrganisation | grep -qxF foo", + "nixos-taskserver user list anotherOrganisation | grep -qxF bob" + ); + + $server->waitForOpenPort(${portStr}); + + $client1->waitForUnit("multi-user.target"); + $client2->waitForUnit("multi-user.target"); + + setupClientsFor "testOrganisation", "alice"; + setupClientsFor "testOrganisation", "foo"; + setupClientsFor "anotherOrganisation", "bob"; + + testSync $_ for ("alice", "bob", "foo"); + + $server->fail("nixos-taskserver user add imperativeOrg bar"); + readdImperativeUser; + + testSync "bar"; + + subtest "checking certificate revocation of user bar", sub { + $client1->succeed(checkClientCert "bar"); + + $server->succeed("nixos-taskserver user remove imperativeOrg bar"); + restartServer; + + $client1->fail(checkClientCert "bar"); + + $client1->succeed(su "bar", "task add destroy everything >&2"); + $client1->fail(su "bar", "task sync >&2"); + }; + + readdImperativeUser; + + subtest "checking certificate revocation of org imperativeOrg", sub { + $client1->succeed(checkClientCert "bar"); + + $server->succeed("nixos-taskserver org remove imperativeOrg"); + restartServer; + + $client1->fail(checkClientCert "bar"); + + $client1->succeed(su "bar", "task add destroy even more >&2"); + $client1->fail(su "bar", "task sync >&2"); + }; + + readdImperativeUser; + + subtest "check whether declarative config overrides user bar", sub { + restartServer; + testSync "bar"; + }; + ''; +} diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index c131ef7dc8cd8..c8b18f1226580 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -15,11 +15,15 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.displayManager.auto.user = "alice"; services.xserver.desktopManager.xfce.enable = true; + + environment.systemPackages = [ pkgs.xorg.xmessage ]; }; testScript = '' $machine->waitForX; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/xfce4-panel/); $machine->sleep(10); @@ -30,5 +34,9 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForWindow(qr/Terminal/); $machine->sleep(10); $machine->screenshot("screen"); + + # Ensure that the X server does proper access control. + $machine->mustFail("su - bob -c 'DISPLAY=:0.0 xmessage Foo'"); + $machine->mustFail("su - bob -c 'DISPLAY=:0 xmessage Foo'"); ''; }) diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index 9b86bf2b3d5af..e678d6e4acb39 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" - "--with-libcurl-headers=${curl}/include" + "--with-libcurl-headers=${curl.dev}/include" ] ++ optionals withGui [ "--with-gui=qt4" ]; meta = { diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 3d44dd872c782..9f047a600cbdf 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # have to do that ourself. patchPhase = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript + sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ ''; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 627d68525b9b5..afa8a94d200d4 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; })]; + # fix with gcc-5 from http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-December/245884.html + postPatch = '' + substituteInPlace lib-src/libnyquist/nyquist/ffts/src/fftlib.c \ + --replace 'inline void' 'static inline void' + ''; + preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm mkdir lib-src diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 543329ef679b1..2d6b0434d6a1c 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)" + interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" for prog in "$out"/libexec/baudline/baudline*; do patchelf --interpreter "$interpreter" "$prog" ln -sr "$prog" "$out/bin/" diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 978dd27facdb7..d84ff702ce872 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postFixup = '' for executable in $(cd $out/bin && ls); do wrapProgram $out/bin/$executable \ - --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin" + --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin" done ''; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index b2eda29ead5b3..94f20bc543e3f 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -48,7 +48,9 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 18fb48a17ba1d..80e4e49fb1830 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"; }; - outputs = [ "out" "doc" ]; - buildInputs = [ libogg ]; #doCheck = true; # takes lots of time + outputs = [ "dev" "out" "bin" "doc" ]; + meta = with stdenv.lib; { homepage = http://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 21d1d0ef4c67d..c27e049a4ae15 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; configurePhase = '' + runHook preConfigure mkdir build cd build qmake \ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIX="$out" PREFIXSHORTCUT="$out" \ ../fmit.pro + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index f86513659b647..72bec52b2663a 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager + --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager ''; dontPatchELF = true; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index b2dde5b5b31fa..f17abf9752187 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ]; - configurePhase = ''qmake PREFIX=/''; + configurePhase = '' + runHook preConfigure + qmake PREFIX=/ + runHook postConfigure + ''; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index ae1a8ea1edf4d..049920d280793 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure qmake + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 8bc0aebba5a84..f22ccd08a8e87 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; preBuild='' - export CPATH=${zlib}/lib + export CPATH=${zlib.out}/lib ''; buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ]; diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index abb9c50d71c5a..0cb076556c708 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-mopify-${version}"; - version = "1.5.8"; + version = "1.5.17"; src = fetchurl { url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "1gq88i5hbyskwhqf51myndqgmrndkyy6gs022sc387fy3dwxmvn0"; + sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s"; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix index b2bca838cee25..53fb4d6c2f77b 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-musicbox-webclient-${version}"; - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pimusicbox"; repo = "mopidy-musicbox-webclient"; rev = "v${version}"; - sha256 = "0gnw6jn55jr6q7bdp70mk3cm5f6jy8lm3s7ayfmisihhjbl3rnaq"; + sha256 = "0v09wy40ipl0b0dpgmcdl15c5g732c9jl7zipm4sy4pr8xiy6baa"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix index 4d7c1cb732661..034a07bf027d2 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-tunigo-${version}"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "trygveaa"; repo = "mopidy-spotify-tunigo"; rev = "v${version}"; - sha256 = "0827wghbgrscncnshz30l97hgg0g5bsnm0ad8596zh7cai0ibss0"; + sha256 = "1jwk0b2iz4z09qynnhcr07w15lx6i1ra09s9lp48vslqcf2fp36x"; }; propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 3a717344aef59..045c400a17fd4 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-spotify-${version}"; - version = "2.3.1"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "0g105kb27q1p8ssrbxkxcjgx9jkqnd9kk5smw8sjcx6f3b23wrwx"; + sha256 = "0w7bhq6nz2xly5g72xd98r7lyzmx7nzfdpghk7vklkx0x41qccz8"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix index 2942cba95f0f3..d3eb8539a19c0 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy-youtube/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-youtube-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-youtube"; rev = "v${version}"; - sha256 = "1si7j7m5kg0cxlhkw8s2mbnpmc9mb3l69n5sgklb1yv1s55iia6z"; + sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; }; propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 29426f43de13e..c1bdab8622c9a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, pythonPackages, pygobject, gst_python, wrapGAppsHook -, glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly +{ stdenv, fetchFromGitHub, pythonPackages, pygobject3, wrapGAppsHook +, gst_all_1, glib_networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; - version = "1.1.2"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "1vn4knpmnp3krmn627iv1r7xa50zl816ac6b24b8ph50cq2sqjfv"; + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy"; + rev = "v${version}"; + sha256 = "06f1y87dqc7p6kq5npmg3ki8x4iacyjzd7nq7188x20y2zglrjbm"; }; - buildInputs = [ - wrapGAppsHook gst_plugins_base gst_plugins_good gst_plugins_ugly glib_networking + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = with gst_all_1; [ + gst-plugins-base gst-plugins-good gst-plugins-ugly + glib_networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado requests2 + gst-python pygobject3 pykka tornado requests2 ]; # There are no tests diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 488fe45e6c846..f0fd29697b1a5 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "0fq9nk796cp7gs0gwrabb6wp7f5h7pph10hrkrik1wf4k3mzb4k3"; + sha256 = "04mj6r0whikliblxfbz92pibwcd7a3ywkryf01a89zd4bi1jk2rc"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index c27dbad78cc64..02a97dde4e247 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -5,11 +5,6 @@ let major = "3.16"; minor = "1"; - GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -24,15 +19,16 @@ in stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes makeWrapper gnome3.dconf gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; preFixup = '' for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done ''; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e1eee1cdd8ecb..0875ca939ee44 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype +{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf -, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: +, libgcrypt, libudev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: assert stdenv.system == "x86_64-linux"; let - version = "1.0.26.125.g64dc8bc6-15"; + version = "1.0.27.71.g0a26e3b2-9"; deps = [ alsaLib @@ -27,7 +27,7 @@ let nss pango stdenv.cc.cc - udev + libudev xorg.libX11 xorg.libXcomposite xorg.libXcursor @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "01y4jr1r928251mj9kz1i7x93ya0ky4xaibm0q08q3zjsafianz1"; + sha256 = "1rs08cvn0y1lzazlmzj4sn2iyacadwi6j70n5c7rvfvvs4p61p42"; }; buildInputs = [ dpkg makeWrapper ]; @@ -68,10 +68,10 @@ stdenv.mkDerivation { # Work around Spotify referring to a specific minor version of # OpenSSL. - ln -s ${openssl_1_0_1}/lib/libssl.so $libdir/libssl.so.1.0.0 - ln -s ${openssl_1_0_1}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 - ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so - ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so + ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0 + ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 + ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so + ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so rpath="$out/share/spotify:$libdir" @@ -104,6 +104,6 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx ]; + maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu ]; }; } diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 2955a9371ff6f..4bc7801637c6d 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile + sed -e "s#xsltproc#${libxslt.bin}/bin/xsltproc#" -i Makefile sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile ''; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9cc7f3f1fc85d..ab7eb10798d7d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { description = "high quality software synthesizer based on ZynAddSubFX"; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix new file mode 100644 index 0000000000000..364e13e97a90b --- /dev/null +++ b/pkgs/applications/backup/areca/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: + +stdenv.mkDerivation rec { + name = "areca-7.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; + }; + + sourceRoot = "."; + + buildInputs = [ jdk ant acl attr ]; + + patches = [ ./fix-javah-bug.diff ]; + + postPatch = '' + substituteInPlace build.xml --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + substituteInPlace build.xml --replace "gcc" "${stdenv.cc}/bin/gcc" + substituteInPlace areca.sh --replace "bin/" "" + substituteInPlace bin/areca_run.sh --replace "/usr/java" "${jre}/lib/openjdk" + substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + + sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh + sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=${swt}/lib:$out/lib:${acl}/lib#g" bin/areca_run.sh + + # https://sourceforge.net/p/areca/bugs/563/ + substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \ + '[[ "$JAVA_IMPL" = "java" || "$JAVA_IMPL" = "openjdk" ]]' + ''; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/translations + cp areca.sh $out/bin/areca + cp -r bin $out + cp -r lib $out + cp -r translations $out + cp COPYING $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.areca-backup.org/; + description = "An Open Source personal backup solution"; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/applications/backup/areca/fix-javah-bug.diff b/pkgs/applications/backup/areca/fix-javah-bug.diff new file mode 100644 index 0000000000000..5d5feaf9b9432 --- /dev/null +++ b/pkgs/applications/backup/areca/fix-javah-bug.diff @@ -0,0 +1,24 @@ +diff --git a/build.xml b/build.xml +index 1ba08e0..9248b76 100644 +--- a/build.xml ++++ b/build.xml +@@ -56,10 +56,16 @@ + + <target name="compilejni" unless="isWindows"> + <description>JNI compilation task (builds libarecafs.so ... for unix-like operating systems only)</description> ++ + <!--Generate the JNI header--> +- <javah destdir="${root}/jni" force="yes" classpath="${root}/lib/areca.jar"> +- <class name="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/> +- </javah> ++ <exec executable="javah"> ++ <arg value="-d"/> ++ <arg value="${root}/jni"/> ++ <arg value="-force"/> ++ <arg value="-classpath"/> ++ <arg value="${root}/lib/areca.jar"/> ++ <arg value="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/> ++ </exec> + + <!-- Compile the JNI code --> + <exec dir="${root}/jni" executable="gcc"> diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index e4f68d786f403..8e1812ec013ba 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ lndir makeQtWrapper ]; buildInputs = [ unwrapped ] ++ themes; - inherit themes; + themes = map (pkg: pkg.out or pkg) themes; inherit unwrapped; installPhase = '' @@ -81,7 +81,7 @@ stdenv.mkDerivation { mkdir -p "$out/share/sddm" for pkg in $unwrapped $themes; do local sddmDir="$pkg/share/sddm" - if [[ -d "$sddmDir" ]]; then + if [ -d "$sddmDir" ]; then lndir -silent "$sddmDir" "$out/share/sddm" fi done diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 8020ecb12a556..c771026298857 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs }: +, fontconfig, freetype, pam, dbus_libs, makeWrapper }: stdenv.mkDerivation rec { name = "slim-1.3.6"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 33813ca3a660c..9f8f6f5fd0cd5 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib +{ stdenv, fetchurl, lib, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let - atomEnv = buildEnv { - name = "env-atom"; - paths = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd - ]; - }; + atomPkgs = [ + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd + ]; + atomLib = lib.makeLibraryPath atomPkgs; + atomLib64 = lib.makeSearchPathOutputs "lib64" ["lib"] atomPkgs; + in stdenv.mkDerivation rec { name = "atom-${version}"; version = "1.6.2"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "${name}.deb"; }; - buildInputs = [ atomEnv gvfs makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; @@ -41,10 +41,10 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ - --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" \ + --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" \ --prefix "PATH" : "${gvfs}/bin" wrapProgram $out/bin/apm \ - --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 131675486bada..127ed981a6c85 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, makeWrapper, dbus, udev }: +, cups, libgcrypt_1_5, libudev, makeWrapper, dbus }: let bracketsEnv = buildEnv { name = "env-brackets"; paths = [ gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 - dbus udev + dbus libudev.out ]; }; in @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ln -sf $out/opt/brackets/brackets $out/bin/brackets - ln -s ${udev}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 53b7b5750a047..76df6d4d2b999 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig"; + postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] ++ optional contribPlugins "--with-contrib-plugins"; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index f4804c75ca3b5..e4eb6eb8f658f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib , glib, gtk, libXtst, jdk , webkitgtk2 ? null # for internal web browser diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index d969552ecde42..712ede2e316f0 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\" ''; - NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24"; + NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24"; makeFlags = "-C src prefix=$(out)"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index ffa280d360c51..6359bd7bde182 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "--with-gif=no" "--with-tiff=no" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index c778c42de8576..23133ec262c39 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "LDFLAGS=-L${ncurses}/lib" + "LDFLAGS=-L${ncurses.out}/lib" "--with-xml2=yes" "--with-gnutls=yes" "--with-mac" @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; CFLAGS = "-O3"; - LDFLAGS = "-O3 -L${ncurses}/lib"; + LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index 69ba674d2d49d..c74e47a5243de 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace "/usr/local" "$out" \ - --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \ - --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " \ + --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \ + --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \ --replace "-lcurses" "-lncurses" ''; + buildInputs = [ ncurses ]; preBuild = '' mkdir -p $out/bin mkdir -p $out/man/man1 diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 36f600c148605..fbe6210a39bac 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -37,7 +37,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { truncate --size=$size $fname } - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) if [ "${stdenv.system}" == "x86_64-linux" ]; then target_size=$(get_file_size bin/fsnotifier64) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 6bf5a1a9e6da6..9b87f13d623d6 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev, libnotify +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, libudev, libnotify }: let @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { mv $out/share/LightTable/light $out/bin/light - ln -s ${udev}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + ln -sf ${libudev.out}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${udev}/lib" \ + --replace "/usr/lib/x86_64-linux-gnu" "${libudev.out}/lib" \ --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 768842a3875da..65ea62b33686a 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index a6dd7bcb40335..c42940440ae57 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,12 +1,12 @@ { pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }: buildPythonApplication rec { - version = "0.9.2"; + version = "0.9.7"; name = "nvpy-${version}"; src = fetchurl { url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz"; - sha256 = "78e41b80fc5549cba8cfd92b52d6530e8dfc8e8f37e96e4b219f30c266af811d"; + sha256 = "1rd3vlaqkg16iz6qcw6rkbq0jmyvc0843wa3brnvn1nz0kla243f"; }; buildInputs = [tk]; @@ -14,6 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pythonPackages.markdown pythonPackages.tkinter + pythonPackages.docutils ]; postInstall = '' diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index ad9fc056757f8..507dc611fd4fc 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,7 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index e415239d76fb0..e51813459c6f5 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { postFixup = '' bin="$out/libexec/TeXmacs/bin/texmacs.bin" rpath=$(patchelf --print-rpath "$bin") - patchelf --set-rpath "$rpath:${zlib}/lib" "$bin" + patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" ''; meta = { diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix new file mode 100644 index 0000000000000..8c7cf73f43202 --- /dev/null +++ b/pkgs/applications/editors/vis/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses, libtermkey, lpeg, lua }: + +stdenv.mkDerivation rec { + name = "vis-nightly-${version}"; + version = "2016-04-15"; + + src = fetchFromGitHub { + sha256 = "0a4gpwniy5r9dpfq51fxjxxnxavdjv8x76w9bbjnbnh8n63p3sj7"; + rev = "472c559a273d3c7b0f5ee92260c5544bc3d74576"; + repo = "vis"; + owner = "martanne"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + unzip + pkgconfig + ncurses + libtermkey + lua + lpeg + ]; + + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; + LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; + + postInstall = '' + echo wrapping $out/bin/vis with runtime environment + wrapProgram $out/bin/vis \ + --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ + --prefix VIS_PATH : "$out/share/vis" + ''; + + meta = { + description = "A vim like editor"; + homepage = http://github.com/martanne/vis; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vrthra ]; + }; +} + diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 64b46c2ac6ecd..0d9572ebc223d 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,90 +1,50 @@ -{ callPackage, stdenv, fetchurl, makeWrapper -, jq, xlibs, gtk, python, nodejs +{ stdenv, callPackage, fetchurl, unzip , ... } @ args: let - electron = callPackage ../../../development/tools/electron/default.nix (args // rec { - version = "0.35.6"; - sha256 = "1bwn14769nby04zkza9jphsya2p6fjnkm1k2y4h5y2l4gnqdvmx0"; - }); + atomEnv = callPackage ../../../development/tools/electron/env-atom.nix (args); + + version = "0.10.10"; + rev = "5b5f4db87c10345b9d5c8d0bed745bcad4533135"; + sha256 = if stdenv.system == "i686-linux" then "1mmgq4fxi2h4hvz7yxgzzyvlznkb42qwr8i1g2b1akdlgnrvvpby" + else if stdenv.system == "x86_64-linux" then "1zjb6mys5qs9mb21rpgpnbgq4gpnw6gsgfn5imf7ca7myk1bxnvk" + else if stdenv.system == "x86_64-darwin" then "0y1as2s6nhicyvdfszphhqp76iv9wcygglrl2f0jamm98g9qp66p" + else throw "Unsupported system: ${stdenv.system}"; + + urlMod = if stdenv.system == "i686-linux" then "linux-ia32" + else if stdenv.system == "x86_64-linux" then "linux-x64" + else if stdenv.system == "x86_64-darwin" then "darwin" + else throw "Unsupported system: ${stdenv.system}"; + in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "0.10.10"; + inherit version; src = fetchurl { - url = "https://github.com/Microsoft/vscode/archive/${version}.tar.gz"; - sha256 = "1mzkip6621111xwwksqjad1kgpbhna4dhpkf6cnj2r18dkk2jmcw"; + url = "https://az764295.vo.msecnd.net/stable/${rev}/VSCode-${urlMod}-stable.zip"; + inherit sha256; }; - buildInputs = [ makeWrapper jq xlibs.libX11 xlibs.xproto gtk python nodejs electron ]; - - extensionGalleryJSON = '' - { - \"extensionsGallery\": { - \"serviceUrl\": \"https://marketplace.visualstudio.com/_apis/public/gallery\", - \"cacheUrl\": \"https://vscode.blob.core.windows.net/gallery/index\", - \"itemUrl\": \"https://marketplace.visualstudio.com/items\" - } - } - ''; - - configurePhase = '' - # PATCH SCRIPT SHEBANGS - echo "PATCH SCRIPT SHEBANGS" - patchShebangs ./scripts - - # ADD EXTENSION GALLERY URLS TO APPLICATION CONFIGURATION - echo "AUGMENT APPLICATION CONFIGURATION" - echo "$(cat ./product.json) ${extensionGalleryJSON}" | jq -s add > tmpFile && \ - mv tmpFile ./product.json - ''; - - buildPhase = '' - # BUILD COMPILE- & RUN-TIME DEPENDENCIES - echo "BUILD COMPILE- & RUN-TIME DEPENDENCIES" - mkdir -p ./tmp - HOME=./tmp ./scripts/npm.sh install - - # COMPILE SOURCES - echo "COMPILE SOURCES" - ./node_modules/.bin/gulp - ''; - - doCheck = true; - checkPhase = '' - # CHECK APPLICATION - echo "CHECK APPLICATION" - ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 ${electron}/bin/electron ./node_modules/.bin/_mocha - ''; + buildInputs = [ unzip ]; installPhase = '' - # PRUNE COMPILE-TIME DEPENDENCIES - echo "PRUNE COMPILE-TIME DEPENDENCIES" - npm prune --production + mkdir -p $out/bin + cp -r ./* $out/bin - # COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY - echo "COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY" - mkdir -p "$out" - cp -R ./.vscode "$out"/.vscode - cp -R ./extensions "$out"/extensions - cp -R ./out "$out"/out - cp -R ./node_modules "$out"/node_modules - cp ./package.json "$out"/package.json - cp ./product.json "$out"/product.json - cp ./tslint.json "$out"/tslint.json - # COPY LEGAL STUFF - cp ./LICENSE.txt "$out"/LICENSE.txt - cp ./OSSREADME.json "$out"/OSSREADME.json - cp ./ThirdPartyNotices.txt "$out"/ThirdPartyNotices.txt + ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/code + '' else ""} + ''; - # CREATE RUNNER SCRIPT - echo "CREATE RUNNER SCRIPT" - mkdir -p "$out"/bin - makeWrapper "${electron}/bin/electron" "$out/bin/vscode" \ - --set VSCODE_DEV 1 \ - --add-flags "$out" + postFixup = '' + ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then '' + patchelf \ + --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/code)" \ + $out/bin/code + '' else ""} ''; meta = with stdenv.lib; { @@ -95,7 +55,8 @@ in It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences. ''; homepage = http://code.visualstudio.com/; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; + downloadPage = https://code.visualstudio.com/Updates; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 39ba1f7265bca..c373f8b9e2723 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { "--with-wxwidgets" "--with-netcdf" "--with-geos" - "--with-postgres" + "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" "--with-mysql" "--with-mysql-includes=${mysql.lib}/include/mysql" "--with-blas" ]; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e75e86a4d5337..ef3b7b05b1874 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "imagemagick-${version}"; - version = "6.9.2-0"; + version = "6.9.3-8"; src = fetchurl { urls = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # the original source above removes tarballs quickly "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" ]; - sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; + sha256 = "129s4cwp6cbhgsr3xr8186q5j02zpbk6kqfk4j7ayb563zsrdb4h"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index dded423652cec..fa9a7e0fdd3fc 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -32,6 +32,7 @@ in ]; configurePhase = '' + runHook preConfigure export GITREV=${gitRev} export GITBRANCH=${gitBranch} export GITTAG=${gitTag} @@ -39,6 +40,7 @@ in cd qt export sourceRoot=$sourceRoot/qt qmake antimony.pro PREFIX=$out + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a41e1ad07d3c1..119125066bda0 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -70,7 +70,7 @@ let # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" "-DENABLE_BALOOSUPPORT=ON" "-DENABLE_KDEPIMLIBSSUPPORT=ON" diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 8602a9a04f853..43aa8bfa1f58f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,13 +2,15 @@ , libXinerama, curl, libexif }: stdenv.mkDerivation rec { - name = "feh-2.14"; + name = "feh-2.15.2"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0j5wxpqccnd0hl74z2vwv25n7qnik1n2mcm2jn0c0z7cjn4wsa9q"; + sha256 = "0bnfk50y2l5zkr292l4yyws1m7ibdmr398vxj7c0djh965frpj1q"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ --add-flags '--theme=feh' ''; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index e2cc0ec5c01eb..6508b16d15a7c 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2 -, lcms, intltool, gettext, libchamplain, fbida +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2 +, lcms, intltool, gettext, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.1"; # Don't upgrade to 1.2; see fee59b1235e658954b207ff6679264654c4708d2. + version = "1.2.3"; src = fetchurl { - url = "mirror://sourceforge/geeqie/${name}.tar.gz"; - sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"; + url = "http://geeqie.org/${name}.tar.xz"; + sha256 = "2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248"; }; + preConfigure = "./autogen.sh"; + configureFlags = [ "--enable-gps" ]; buildInputs = [ - pkgconfig gtk libpng exiv2 lcms intltool gettext - #libchamplain + pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 55e85fc5ec6bc..b09838656929a 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 9d68a44821a59..f9b24581929a2 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,14 +1,9 @@ -{ stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick +{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools }: let version = "1.3"; - qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [ - qtquickcontrols - qtdeclarative - qtmultimedia - ]; in stdenv.mkDerivation rec { name = "photoqt-${version}"; @@ -18,7 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + qtmultimedia qtdeclarative ]; preConfigure = '' @@ -26,7 +22,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}" + wrapQtProgram $out/bin/photoqt ''; meta = { diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index a26346add7ff2..4ed3a424031d3 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase exiv2 ]; configurePhase = '' + runHook preConfigure sed -i 's;/usr;;' phototonic.pro qmake PREFIX="" + runHook postConfigure ''; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index cb92947b766d6..90cb360e7d57f 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline ]; configurePhase = '' - qmake; + runHook preConfigure + qmake sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile) + runHook postConfigure ''; meta = { diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index 47532972893f9..ae1526990f277 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-04-06"; + version = "2016-04-14"; src = fetchgit { - sha256 = "af0b5943787bfe86169cd9bbf34284152e18b6df1f692773369545047e54a288"; - rev = "e6b6ad9d4847e86aed8be0837a19bfada881f52d"; + sha256 = "414fa7753043f8f3775d926eede01a9dbccf6255b2b2b961a3c48b4fa76a4952"; + rev = "19c128a23e27c1ab5a030fa6ff74da1b740629bb"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 23a2d23b1ae16..d645a15b02eac 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { patches = [ ./cstdio.patch ]; cmakeFlags = [ - "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so" - "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so" + "-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so" + "-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so" "-DBUILD_UTILS=1" "-DBUILD_SEG3D=1" "-DBUILD_DATAFLOW=0" diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index da8bbad33cad8..94094a149c920 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; configureFlags = [ "--disable-gsettings-convert-install" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 6903837e5ad57..c70b1029b7910 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11"; + NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; patches = let diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 135ae47aa846e..941e1a393b158 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; }; + outputs = [ "out" "doc" ]; # headers are just two and very small + preConfigure = if stdenv.isDarwin then '' export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:"`pwd`/build/src '' else '' diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 0085da5b468fd..3e7ad83c0a121 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.77"; + name = "blender-2.77a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0aynm249xgrnm6h5hlp9x40ww0hn391d9ka2mg9mmqrdzhih286n"; + sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p"; }; buildInputs = diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index bae4c83fb2b38..7b789b3881de9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome export POPPLER_INC_DIR=${poppler_utils}/include/poppler - export POPPLER_LIB_DIR=${poppler_utils}/lib + export POPPLER_LIB_DIR=${poppler_utils.out}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib - export FC_INC_DIR=${fontconfig}/include/fontconfig - export FC_LIB_DIR=${fontconfig}/lib + export FC_INC_DIR=${fontconfig.dev}/include/fontconfig + export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib export SIP_BIN=${sip_4_16}/bin/sip @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils}/bin + --prefix PATH : ${poppler_utils.out}/bin done ''; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 92328ab9846ce..67b9b601139d9 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; nativeBuildInputs = [ makeQtWrapper ]; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + runHook preConfigure + qmake PREFIX=$out + runHook postConfigure + ''; installPhase = "make -j $NIX_BUILD_CORES INSTALL_ROOT=$out install"; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 6afd11a555cb1..b7db33609cc5c 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym"; }; + postPatch = '' + sed -i 's,--static,,g' Makefile + ''; + installPhase = '' mkdir -p $out/bin cp build/CuraEngine $out/bin/ diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index b0f89cc5ea036..910b24358b484 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; }; + outputs = [ "dev" "out" "bin" ]; + buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index c398c3c43d00d..651c74b2d2176 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram "$out/bin/dunst" \ - --prefix PATH : '${dbus_daemon}/bin' + --prefix PATH : '${dbus_daemon.out}/bin' ''; meta = { diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 69f41571c4504..ca807f80e1bfb 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -18,11 +18,11 @@ in pythonPackages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0lj3a8zg6dznpnnxyza8a05c13py52j62rqlad1zcgksm5g63vic"; + sha256 = "0rpqpspmrmgm0bhsnlnhlwhag6zg8hnv5bcw5vkqmv86891kpd9a"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 488a9a3732e21..e5a463bb5201c 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -7,6 +7,7 @@ buildPerlPackage { preConfigure = "touch Makefile.PL"; doCheck = false; + outputs = [ "out" "man" ]; patchPhase = '' sed -e 's|^update_script|#update_script|' \ @@ -15,10 +16,11 @@ buildPerlPackage { ''; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB - ''; + wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB + cp get_iplayer.1 $out/share/man/man1 + ''; src = fetchurl { url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 0b721b562b533..cfa38a118614d 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk gettext ]; makeFlags = [ "PREFIX=$(out)" ] - ++ optional withBuildColors "TPUT=${ncurses}/bin/tput" + ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput" ++ optional (!withBuildColors) "TPUT_AVAILABLE=0" ; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix new file mode 100644 index 0000000000000..82695bbdd7eec --- /dev/null +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia +, qttools, yacc, flex, zlib, config, makeQtWrapper }: +stdenv.mkDerivation rec { + name = "golden-cheetah-${version}"; + version = "V4.0-DEV1603"; + src = fetchurl { + url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/${version}.tar.gz"; + sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah"; + }; + buildInputs = [ + qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib + ]; + nativeBuildInputs = [ makeQtWrapper ]; + configurePhase = '' + runHook preConfigure + cp src/gcconfig.pri.in src/gcconfig.pri + cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri + echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri + sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + qmake PREFIX=$out build.pro + '' + ( + with (config.golden-cheetah); + stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' + echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri + echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri + ''); + installPhase = '' + mkdir -p $out/bin + cp src/GoldenCheetah $out/bin + wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" # patchelf doesn't seem to work + ''; + meta = { + description = "Performance software for cyclists, runners and triathletes"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + }; +} diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 4f6733e7d8de7..81ac845c5cf88 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -16,8 +16,7 @@ gconftool-2 --recursive-unset /apps/guake with lib; let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; - pySubDir = "lib/${python2.libPrefix}/site-packages"; - pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; version = "0.8.3"; @@ -63,7 +62,7 @@ let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_co wrapProgram $bin \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH" + --prefix PYTHONPATH : "$out/${python2.sitePackages}:${pyPath}:$PYTHONPATH" done ''; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 1f78355ca3a1a..3e35b7bde4b84 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''} + ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix new file mode 100644 index 0000000000000..ad07c02f50848 --- /dev/null +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, dmenu }: + +stdenv.mkDerivation rec { + name = "j4-dmenu-desktop-${version}"; + version = "2.14"; + + src = fetchFromGitHub { + owner = "enkore"; + repo = "j4-dmenu-desktop"; + rev = "r${version}"; + sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128"; + }; + + postPatch = '' + sed -e 's,dmenu -i,${dmenu}/bin/dmenu -i,g' -i ./src/Main.hh + ''; + + nativeBuildInputs = [ cmake ]; + + # tests are fetching an external git repository + cmakeFlags = [ "-DNO_TESTS:BOOL=ON" ]; + + meta = with stdenv.lib; { + description = "A wrapper for dmenu that recognize .desktop files"; + homepage = "https://github.com/enkore/j4-dmenu-desktop"; + license = licenses.gpl3; + maintainer = with maintainers; [ ericsagnes ]; + }; +} diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 679dc10291a7c..c6aad7194a2b8 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, python2Packages }: python2Packages.buildPythonApplication rec { - version = "0.8.1"; + version = "0.9.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1"; + sha256 = "1cj6rlvbk05cfjkl1lnyvq12sb847jjwqy5j8906p2b2x4wq72qi"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index aa8492544dcc1..3de37fdbf207c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { make install cp -r src/dependencies/xulrunner $out/lib/kiwix - patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner + patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index e7829be03647e..1fa5d1a28d57a 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { checkTarget = "test-release"; # this would be the target installPhase = '' - installBin \ + install -Dt "$out/bin/" \ src/bitmonerod \ src/connectivity_tool \ src/simpleminer \ diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 16a20015c6295..056edd801c074 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" + substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" ''; postInstall = '' diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 3e972f672cc25..25c9048809237 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = { diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index d6b9b943b6e41..696232c9f8d6f 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { glib portaudio ]; cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index b245a6aace7b5..bf1bed08ed4c6 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanfm-1.2.3"; +stdenv.mkDerivation rec { + name = "pcmanfm-1.2.4"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.3.tar.xz"; - sha256 = "1033rw5jd7nlzbcdpx3bik7347kyh1sg1gkla424gq9vqqpxia6g"; + url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; + sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; }; buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 23781d63664c5..24a0a8c69675c 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \ --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \ --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \ - --prefix LD_LIBRARY_PATH : ${poppler}/lib + --prefix LD_LIBRARY_PATH : ${poppler.out}/lib ''; dontStrip = true; diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 658ff410d3790..222dddc0e8974 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; - configureFlags = [ "--with-curses=${ncurses}" "--with-readline=${readline}" ]; + configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline}" ]; meta = with stdenv.lib; { description = "A viewer for info files"; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 178fc13065b31..4bf6e36f1d261 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -26,7 +26,7 @@ assert stdenv.isLinux; let version = "4.2.9"; - binpath = stdenv.lib.makeSearchPath "bin" + binpath = stdenv.lib.makeBinPath [ cabextract python2Packages.python gettext diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 08e7f834d6bb1..69730759d0846 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; - configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out"; + configurePhase = '' + runHook preConfigure + qmake CONFIG+=release PREFIX=$out DESTDIR=$out + runHook postConfigure + ''; installPhase = '' mkdir $out/bin diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index ad7de90cad631..ec055f3055fc4 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -24,18 +24,18 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/include/dbus-1.0" + "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [ + PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [ pythonPackages.curses pythonPackages.lockfile ]; buildPhase = '' # Fix up the LD_LIBRARY_PATH so that expat is on it - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" python mscript.py configure --prefix="$out" python mscript.py build diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 68097c2e2544c..194535c7314cd 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.buildPythonApplication rec { - version = "1.8.0"; + version = "1.9.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0vp9yapm6bm4zdhd1ibbirc23ck7smrbsrask7xkrnz7qysxgsd3"; + sha256 = "18r3i2zlcprj6d4nzhhbd6sm1fs2x28924xsm6lcxa1643gkyb7i"; }; propagatedBuildInputs = with pythonPackages; [ @@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index c3b5fc861a85c..e8914b75b8a5b 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -1,18 +1,38 @@ -{ stdenv, fetchurl, libX11, libXt }: +{ stdenv, fetchurl +, pkgconfig, libtool +, libX11, libXt, libXpm }: -stdenv.mkDerivation { - name = "rxvt-2.6.4"; +stdenv.mkDerivation rec { + name = "rxvt-${version}"; + version = "2.7.10"; src = fetchurl { - url = mirror://sourceforge/rxvt/rxvt-2.6.4.tar.gz; - sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg"; + url = "mirror://sourceforge/rxvt/${name}.tar.gz"; + sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; - buildInputs = [ libX11 libXt ]; + buildInputs = [ pkgconfig libtool libX11 libXt libXpm ]; - meta = { + configurePhase = '' + LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color + ''; + + meta = with stdenv.lib; { + homepage = http://rxvt.sourceforge.net/; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; - homepage = http://www.rxvt.org/; - license = "GPL"; + longDescription = '' + rxvt (acronym for our extended virtual terminal) is a terminal + emulator for the X Window System, originally written by Rob Nation + as an extended version of the older xvt terminal by John Bovey of + University of Kent. Mark Olesen extensively modified it later and + took over maintenance for several years. + + rxvt is intended to be a slimmed-down alternate for xterm, + omitting some of its little-used features, like Tektronix 4014 + emulation and toolkit-style configurability. + ''; + maintainers = with maintainers; [ AndersonTorres ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 234e8b6ba6948..deceba0ea5548 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig -, conf? null}: +, conf ? null, patches ? []}: with stdenv.lib; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"; }; + inherit patches; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index ed7e0cf7ca1d2..4d9f0ef3f8d5b 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, writeText , ncurses, wayland, wld, libxkbcommon, fontconfig, pixman -, conf? null}: +, conf ? null, patches ? [] }: with stdenv.lib; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; }; + inherit patches; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 63a8d6cf7897a..68dd69f385d9f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -48,7 +48,7 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index da038a6938136..61b47dcdd2ad3 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -42,7 +42,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index bf99f0f5f6517..43b7312cda64e 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; - LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build # The config locking scheme relies on the binary being called "tilda", # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index f4162147258cf..c21c0d32b7304 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,37 +1,41 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama -, libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs -, libXdmcp, librsvg, libstartup_notification +{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib +, pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11 +, libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg +, libstartup_notification, wrapGAppsHook }: stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "0.12.7"; + version = "0.12.9"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r"; + sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q"; }; enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama - libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs - libXdmcp librsvg libstartup_notification - ]; - - preConfigure = - '' - substituteInPlace CMakeLists.txt --replace /etc $out/etc - ''; - - prePatch = - '' - substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/ - substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/ - substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/ - ''; + nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; + + buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender + libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp + librsvg libstartup_notification ]; + + preConfigure = '' + substituteInPlace CMakeLists.txt --replace /etc $out/etc + ''; + + prePatch = '' + for f in ./src/tint2conf/properties.c \ + ./src/launcher/apps-common.c \ + ./src/launcher/icon-theme-common.c \ + ./themes/*tint2rc + do + substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/ + done + ''; meta = { homepage = https://gitlab.com/o9000/tint2; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index bb3f359ab8ff4..fbbf45877d23e 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtx11extras pkgconfig boost ]; configurePhase = '' + runHook preConfigure sed -i s/-Werror// twmnd/twmnd.pro qmake + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 75c02d3ba6ddf..8ce683ec9088e 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { --with-mount-prog=${utillinux}/bin/mount \ --with-umount-prog=${utillinux}/bin/umount \ --with-losetup-prog=${utillinux}/bin/losetup \ - --with-setfacl-prog=${acl}/bin/setfacl \ + --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; preConfigure = '' diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index ffba09e69f951..e861973b13cc2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xca" \ - --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" + --prefix LD_LIBRARY_PATH : \ + "${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}" ''; buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix new file mode 100644 index 0000000000000..cf8bcb7a51b9b --- /dev/null +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, txt2tags, python2Packages }: + +stdenv.mkDerivation rec { + name = "xdgmenumaker-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + rev = version; + owner = "gapan"; + repo = "xdgmenumaker"; + sha256 = "1n29syadsgj0vpnkc8nji4k1c8gminr1xdriz5ck2bcygsgxkdrd"; + }; + + nativeBuildInputs = [ + txt2tags + python2Packages.wrapPython + ]; + + pythonPath = [ + python2Packages.pyxdg + python2Packages.pygtk + ]; + + installPhase = '' + make install PREFIX=$out DESTDIR= + wrapProgram "$out/bin/xdgmenumaker" \ + --prefix XDG_DATA_DIRS : "$out/share" + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Command line tool that generates XDG menus for several window managers"; + homepage = https://github.com/gapan/xdgmenumaker; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index cc08436fa0331..8e3165b75d26b 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango}/include/pango-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/include/gdk-pixbuf-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/lib/gdk-pixbuf-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include" export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" ''; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 3a88409999fce..62e7ee60cb3e4 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" - "TPUT=${ncurses}/bin/tput" + "TPUT=${ncurses.out}/bin/tput" ]; postInstall = '' diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 8b37e22d117a0..0ad3bf2adb991 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -30,7 +30,7 @@ rec { name = "zathura-${zathura_core.version}"; - plugins_path = stdenv.lib.makeSearchPath "lib" [ + plugins_path = stdenv.lib.makeLibraryPath [ zathura_djvu zathura_ps (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7bcc6242389d5..9fbc8959ad26d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, pciutils, nss , python, pythonPackages, perl, pkgconfig -, nspr, udev, kerberos +, nspr, libudev, kerberos , utillinux, alsaLib , bison, gperf , glib, gtk, dbus_glib @@ -112,7 +112,7 @@ let buildInputs = defaultDependencies ++ [ which python perl pkgconfig - nspr nss udev + nspr nss libudev utillinux alsaLib bison gperf kerberos glib gtk dbus_glib @@ -147,7 +147,7 @@ let }' chrome/utility/media_galleries/image_metadata_extractor.cc ''} - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${libudev.out}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a0b354f0327c8..b7883454b3495 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,6 +44,7 @@ let phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; outputs = [ "flash" "widevine" ]; + out = "flash"; # outputs TODO: is this a hack? unpackCmd = let chan = if upstream-info.channel == "dev" then "chrome-unstable" @@ -64,7 +65,7 @@ let patchPhase = let rpaths = [ stdenv.cc.cc ]; - mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; + mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index d79a5215ce218..2a8d8d753c800 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ , json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { - name = "dwb-2015-07-07"; + name = "dwb-2016-03-21"; src = fetchgit { - url = "https://bitbucket.org/0mark/dwb_collect"; - rev = "9a50dcc7134015c6cb1d26afb77840cf69f7c782"; - sha256 = "03nyr3c0x5b1jqax0zh407vvi4j47zkj1i52lqs35j2d2sci3lkb"; + url = "https://bitbucket.org/portix/dwb"; + rev = "7fb82bc1db36a5d1d2436088c9b58054d2c51f96"; + sha256 = "16y3cfk4bq89d1lzpj4ci4gq9cx5m2br5i7kmw5rv396527yvn0i"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup @@ -18,10 +18,10 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" ''; meta = with stdenv.lib; { @@ -30,9 +30,5 @@ stdenv.mkDerivation { platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; - - # dwb is no longer maintained by portix and efforts to keep it alive - # were not successful, see issue #7952 for discussion. - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d2d6fcb59342d..152089286b485 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { libheimdal libpulseaudio systemd - ] + ":" + stdenv.lib.makeSearchPath "lib64" [ + ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 1ff70cb8ccf73..883b2abf44ac8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,187 +4,187 @@ # ruby generate_sources.rb > sources.nix { - version = "45.0.1"; + version = "45.0.2"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "6dff17afbbbb9ba8e064b431db1f6b6a1862ec56e11dfa8cb8ef5d89dd9f7705"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "4f806511a1e7c2100d976a9753f0e7ecee483f19ca1176e1867021a55725aabf"; } - { locale = "af"; arch = "linux-i686"; sha256 = "0a2e0b55e43b41304895f624ae95372e4ab52b06c8892e0ef02a8e41c5ff28e5"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "c865d4a431c3b92347393b62c4589fe67f4323458faf1ee07367e1f432d0e839"; } - { locale = "an"; arch = "linux-i686"; sha256 = "d58dcdb222fad88650d65623005897de7a693d16c44d86f25694a00d7fa5111d"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "b00ac5cf76fe562cac8f72327cdf0e54b2c4384586fbb064deb72d2741e05268"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "42851096189bc53d18ea26d9de1d0321b033a5601594c0515530263cf3155b12"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "4d7e8760da3dac6cffa8eafeb22c759bfad3664bba7f690c0f1d1aa5284aed3c"; } - { locale = "as"; arch = "linux-i686"; sha256 = "706d584ea78172ec88c29d124abf2bd34881c9752231fdb3f491d0bf858fc5c5"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "13ed628c2ef29b8d3188274e6fc101ba622d4e1ca20880b381e62225c5f057d5"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "9f8f5870245cf0016d4a9a540d29d31249188fa8f390c47cfd330874eb20e8dd"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "9bd85381abe1335ca9208ad764477e6f2a926288058c91aee0af3a3967aa1e57"; } - { locale = "az"; arch = "linux-i686"; sha256 = "9e117f5aabdb8f71bcaf8073c76c4b795c957e6739471fed0f484d0ed39b5a98"; } - { locale = "az"; arch = "linux-x86_64"; sha256 = "06ee5bd4f1096e6728120fbed4ed6cbc88cb1003c484a15dd624254ae93ed849"; } - { locale = "be"; arch = "linux-i686"; sha256 = "c6091272b395905e746271176d354ff59eccc9d96c5e1ecc2e8e5c3ac65ed2f0"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "090ba5d28858b2c58a6a29ce0f435797a938cd788ebd3413db4ced224329d2e4"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "1b8b5bbe6473b13fb80ca31514f7386015f5920c7a3d8391aa5549eedcfd09ce"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "b49fa01d8749c1b4d327dca2379e4940d5d85d310e998cad66efecc2f485cf9c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "3372a82af514706d8eacc5e4d35584379408db964c3cfd35ea75597ddefad7e8"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "798a2a405e175f8347dfd933300eba728cde6dbe47fa831552e40b87455bd921"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3895feec666feb59a554310efc70b248d63906ca6bde59c03d9a29fa2d4cd7c2"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "58725666980beeb5a651683a76be2084ba9d40530a063f1f1ebf160fb4db8e0b"; } - { locale = "br"; arch = "linux-i686"; sha256 = "21d56c17d225a6a35711bb8354724a05ad15ec565cc70ec128384f9b8762edba"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "c0cc5568b2fac5ba35ef742fd1f87fbb73e1bca47240e888848ac804f4bd7714"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "4b2d818c81bc15dad48c47847c14a00cec5b93615a23cb5d2068f4a2ef98b810"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "a35a4cd723c446ac5593989f7fc4a56aace5cbf6bce757f3a92986e795ab07ba"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "66497de3bf6069c1af68f6a50988919b8ff37afb9da7ce327a5beb014b75aa0f"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "188b43172959c2ef064ef558d0b6518409eb19bb33add98d77a8bf260def55e6"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "2ccd96ef1b831580dcfe84f62501fcebae7fdf8a803786913bd24a9cc9904ff7"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "c9e1665399f055c561ec6d8df90235c3bfb3570d7ec613b959e80c5080e7c614"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "789aadc04e83af8cc08cb9dd67bc61aef337a31d2ac17239c194de2d12608b6e"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "6d695037d9000911422a6b50d09ef250044d629368900ec569a06ac245c1eb2a"; } - { locale = "da"; arch = "linux-i686"; sha256 = "b63788d28be0cbc37499e5ad41b8a904413c537a5786b1c2934c304f2adf4ded"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "a5d4cf1dec637ce5c09ee9f8be82ad32756a56ff0e8c529c945b40adb3b928e0"; } - { locale = "de"; arch = "linux-i686"; sha256 = "ae3b299a514423faf79bd21952f90e37a4d8e7be2cadca9a1befff4160f103e7"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "971b80131db7e1facd480546d9bd780bf69d2a99338d9e50415eb6583e550cdd"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "87c439cfbd139477055e5a8bd421aa65cb75cdb93090a54899d25411ab3d5dde"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "2a04b723d1ed3f9bab3dc9f11fc315fbce2543bfff37532e7cd7a4b9a33d7936"; } - { locale = "el"; arch = "linux-i686"; sha256 = "37e02fb347d8cb1f3b5079c3be055c0e37cdb3a6ab97b2928237beeb446e800e"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "9a439341ff9c39cfe8dcb6681221d0d78690ad063ac99a201001f5787b5ec270"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "a3cc4951a826e483ddb7832333e032e9197418cacdb4250e5072de1ad2fef5d2"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "433ecbabc4d1fabb2ebad958c4e7a0bb9cff9a657b1a641f820d5f0a7ba8c1f1"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "a78498b51059f46d42cf2fcb2232d57d97f2ab4e8a789151d3a26e013132dbb8"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "251e8d67abe989ddbf7cf9e78bba58eee43e3b1eb0c461a9c6c376bda6c71a87"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "d6195b72e56ca9ea366ab47885ee22b0f7bf4811b3cc937c36af53fe4e6f5d89"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "f82eba9a593fd6ad8a9b5b8b61d2ccf986080a1cff2af598afe930cd96423a5d"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "b6bcfea89be5883e1e5d2899bab371b7d972d4be5717d21d522bc56679463dd9"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "4908438cf56646665f91bf12e46c611818c5323979048d01bbdc4d5cf945832d"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "ace48b5a36bccf1d21e17611e9ef7c21786f207da111473479473e5bc5817fe9"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "277ec48d9b45bd41dcaa141d67f5f814845d5e0faeca97c6f5d507f8c9ce5312"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "78cb60452201df5cff7ed7da54f3f876596de0a895887f8016b3d642d727e96c"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "3be79c28ea7f7ea075fc92e418ff980176dc9707329f1043c54161e703b43028"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "4bb8d2732754c1112bc8d32a26b0cfee79449447a4cb8ca368f1d41e9ba43d37"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "f512f8f1b163c72234173944c5781550810b90c2b6a1a6f8d070b87a8f85192e"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "01f2b5e09792714b6315933ec714c5d1baa77bbab5b4e4d06ecf670c47c75d40"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "c7af08a37c116a5cb805cf0b60ef1b1a8f956fec3381ceb0288c62355b05c91b"; } - { locale = "et"; arch = "linux-i686"; sha256 = "0aac86a5cd520a806aedc2f8111798eebcb08919099973f7d7fc7addfbaa0584"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "fa0ad1bfd65d231cc58c9d79fb07cd4a98d5976e870af017642a77ebd7a4b260"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "4bad5d7e4e2d917606f63efa079092516ff1435013adb8aedbe95a53aa2c594a"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "9e390ebf06c5abc46f80ec8c77bd7572de827ee5d368de34c1252ee386687372"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "9738ddfbaaf3e34c5546c584d9dbdeca68086e66f06b438760befb23e07593cd"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "55e8f1f2547a9c7c3bb3cf7029e166ae42a3745f51b58c87d7eeaf6ecdb81952"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "dfb266913e27299469de2a5ffedd5fa47f344d6d7e092ddf630cde726b94934d"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "370e310c39f0a87cc8e3ecc5bd6c8f3bbd863b1a8d7e613a0c2fa9be7b8b988c"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "2d10c5e21f414cc83a5413e8a2fc53124c2dadb718861410fa45e57c8ba4fd7c"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "d791eda3135572d0735393ee1101383b4d20142a4279dfe615a9e20c341ea4ea"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "94118a53c25a0fb243b63d51a64c077672c4c93d7ca964f6384e3bb8234891a1"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "6ccd8216017b2593430a812ea167a97012060d41fbf610bf518b8d997ac59c53"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "bd5cfd3565353ae8d01d8c9089a364394aa0ebc4547a41dba11ced14a494ed9d"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "0db0aa59c0df881f901d794fdf99f5abd27db88e0c3ab2d364b22eb7326152db"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "59486516e8aa13ca113e1f2998b05509dba0546aa7b11d99ff6da55a6f069f64"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "1cda950ea6cc6d8957d580fd2c59784bf6cd339083f0fc3cd3a084e0326b0041"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "602047e1669e9551f7a3501082e81e3e79287082b981d59f515887c5e892fb70"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "d5b901d78e06a75d2534214bb849e31696ec44349c18b9b511e68951d29fde90"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "d55a556321c600024ea2fc38d9671f34c490046da88a89e4ae46d9217bf64677"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "3deb86b766f51a218266cf4d97e1b3332c8ca7d75cc86491d940a8b9f37c0bb5"; } - { locale = "gn"; arch = "linux-i686"; sha256 = "f38099f998e5bc396360856fe2543152feed086b64a85b7ac3bd2b9e3e0ad609"; } - { locale = "gn"; arch = "linux-x86_64"; sha256 = "af4055322dc0524a00fc3ac08a4b2eb40a305dd574b92cc591fee6a00482c4b6"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "3210857982a6628f8c2632995c248eed1bd1c719ddcbacb663839990e67b88c8"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "bb2154aba760896180ae747648530880127c8c46481b04a1ea0cb3b47c2a6f41"; } - { locale = "he"; arch = "linux-i686"; sha256 = "18b5217fee9e30bd4bb7f1ea27445ff4aede149a286c07b7c8e9740330b7e6eb"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "2f51ccc6e5c64976c2f81818d0a4381e508aa5f70ec2108f0e6f512a51574709"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "555318d41795c988f41655bcf4653aef259c2e3dc80fdcf95670c6ada7fe687c"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "683e0437ff9168e159e933bf72f6db2d95ae94bb06bc48a1d1fafd30b7028fe1"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "c7a2cfb5f4594a3690797ee5559949154b3dd8c9e6a4dbd774e312f914e0b268"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "94098ca5f069445a6514d4b7500ae10b018b4e1dba2eb7052a200c5eb707ba41"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "c81cde05298660186d2760e977e43e554a896105765c043caac74b09326358fb"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "4cdd381d2eb94f163637a328e5ee9369eddc0559f17861377566853e2a7ec571"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "0af518a42e35174f838b958823ad1aa24a14ff75a6058c2171594e16d5670d77"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "b4c0212fe6a8df9689d5dfcaa9ebb2a1cf07e1e9817727581411542ea9bf26b5"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "0d62e6627e3ea838089a6b8b8692d034a64b47c66af80561a23bcdd74fcc777b"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "0e07e77cfac6588f8b1c3579b7dfc62feafcb72e7f9f57e2618364e3c02c0527"; } - { locale = "id"; arch = "linux-i686"; sha256 = "9361b3c83f4b3fe84d2918810b4651bc2878eeb3cdc849c513aa3faa17bb9a72"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "baaa11970fb695434fc2c7829d99578f7f48debb5e11729f94b58df330608c36"; } - { locale = "is"; arch = "linux-i686"; sha256 = "3f1fc35dc18a684a22c05a2ce468b5a164b6c83457694f9de4e6f9a72c28c6df"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "046fa860343ea079db768d94c5dbc563d6564df5a177f2a5cb7fdfa965576019"; } - { locale = "it"; arch = "linux-i686"; sha256 = "ce736af6240e803a3c1fabb58bdae2e27e44ff593e56172b3d6d174c89f606e5"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "e2a8fb6e3f18b2be4b7736e3c8adf77968bc13dea7f981e20ae47430b137695c"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "2153c10104c62a5814a4f72fab7be6ffa2e03e5c5cc5f7172820d0a139134fe6"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "446a20d4ca5c7086045f8750eb0bcc850118d2f020a77f8fa4d116064b443953"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "3ddda0311feee7c247fd309a7721f4be8458fa528e63a2e8f58c005f70007144"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "4dd8f3ea040fb2d6056f0c0f615ed38f09c980cee660fba1f8aaf0fd506745eb"; } - { locale = "km"; arch = "linux-i686"; sha256 = "a295d9d466aef89c95989866a38080d3d1b110e4efb52b1a01479817dd1c866c"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "dbb249a1398c335a155ea2b2f6ac4656f8ff00b999035dce9f5a59532043f9c3"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "357077be38c6869602a13abf1f494ec8a124a9eb2c03a395a1b30276110b6913"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "11658a25f30558a6f11f28c80a98800095ef4c5879d456dc3503737a8d9cb465"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "a653f4030480ab17d77c48b144296e78faba7ad48fdce812afbe8243299575c5"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "182858b0c4bd6ece47aff2b406da7442eb3fbe148c3bc20975f6bafd2acd37ac"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "449088107c0077318d95176a90a65219a76c851c98dd5b929452bfde2a87773f"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "8b45df098143a01f915b8eee0f8b7d56b4ec73fc9cfd0fba8c5f4b8582992f80"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "085e9873154fab87c909cef005a82f0d5ab81a8ece9adfe46766ae69418084f6"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "dde643769a14714cb9990fa489389fd5cabcfb26b23c31bb32dbaa17a38f5150"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "f6363da3c7ebd5f9d80454ad126ac1cf03ef2c9fd2eebf5cb174f0d7a9cf1e36"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "41fb793c10d5eb52dd3847f9dee30c3f67c8ad5061897d9f13135b7d1666a84b"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "96af787075b06d96a2e8a261b900f6eb590f4997354dcd9f57a8714af3432a12"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "514e75157308cd6fc96c54592dd1c1f5b556c15c5b211543644f324eee09b1a2"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "1f809ef4d0afcb13bb40459a63be49ab6e074641e8f4ce54e9d2bd89c4b0b141"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "4931d99ddd6851e4e4596a808e6b6e5fe45012711723c6748b752217c70be9d6"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "5081b42676c174226c357c798d64cade2acecf6e935bbfabdaab548d364dd1ff"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "1cbaa2c64d8fc098b67f77660e18a3df3e051396a3d5e0f984294b0823324365"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "d1cc4ef0d9938c85a21e64e4a71539d46a78c709edd1ac1dc331da8ae6af57e1"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "8fc0abfe8e834c0894187fab63becd1e3d4e071609676c1d0a8fd35a4265ec60"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "7f471e30f28f0ccf6bc285d24923be2b53415891f4f0909c31160bd09d8e2c21"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "150101c5a3556664a9e3827edf36c412c64037871a5af5f66c47bed448c8931d"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "67b888c5b666e1428c182dfa79aa1a9a471c785d4dac85e6cf1f618dee9c796a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "57c1aee6f309536788a9a9bd2be3046d65c9b174583de7e0b72cf45f28156f67"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "43feb0205631ff5caa6e7d71fa37a6643b3b3fd92fc06b77cef9e9a0113bb1ce"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "182481c49deb71d9344a8789db40e233326719dbe19973fedeaaa504ba771fcb"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "995abcace6138d11252b60958a8d5a13a1abf94c8017e567053468f811549b24"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "d449fa5534d9a7f5e772678388770f14fa32226b0366e9a2adf7cd245b911139"; } - { locale = "or"; arch = "linux-i686"; sha256 = "a7abea23a03ed38048e724e2f7fa234e24f0f74d8681e39bca5ef183178df923"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "b05963dc6e13757b4afd1a1fa72c3128cbdfc9db3ba16adc20d2fd2eb101f165"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4a30beb8ca9feca58487264abbed2a403336835140767ebac31be24bcf4b9386"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "77b77274a7eac09f4d1a7163ba5555ced722369717d98ba1dab014140a4ac235"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "699b72fd6bdda12d71521bc0e32fb1a95d933dc45f62595e6b02f5441ff6d016"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "d748461e3e45a3d07aa36bde8fd265a51888e34ce0a8e23fdf893e540cc90e16"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "0b7062f911ce1d70e5300cd85328aa507c9a39ad14110a0241e23280af0f6db5"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b2de3df121d0ca4b4c322533040ae5187cff9fad8e8b83997425867c051b636c"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "801a04cd65d7253c95bfb9b680abba87b45e3f0cff18f94b81945ed47154b9e7"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "5e6a28463b388fb2a242af899e521a7c2a4bcc48959d0f6813335fd11e3b5861"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "57d8127547da954a6fdecaaab0006d570125ad577ad7d66e53c97e1c2194258e"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "f6158506cbf3c96a5f6a551969338a65369f2be52bfa80359da3941d2f3277bb"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "980701a87255b999c4df5d82a53b653bb513675ba93e5138bc47e91174d03c3f"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "95e80b8bbd38510719463ca1b67e574f0a1d62daa8fbd09f4bba277749c57517"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "16e6775a26756b445e5c72220297062b3e4e1ab66efd0324eb161a4d5b353874"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "9bc067f5c158f33fdafd8b7ea1ab3492002ceca579a177a292a835d52c430c27"; } - { locale = "si"; arch = "linux-i686"; sha256 = "2fdc744bc85488514b9bcf93b017e6f6fcfd4cf7c249c1e7d307956cb62baf43"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "366893e7b7337ff6bdfe0def0ac88615e9cadb460fbcb17dd047f18172782208"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "3efabb4f04376688f51df5c70fb4cfc0b382e9b6160eb625969945a8e3272a18"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "dd97fc87382cca475b4b8ef8ab137b8f436e4a4792bfc06bcf0e7736e1f5e452"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "3ba940deb5b1db31aaf07c005e62ddbd6acf44d3d0e775aab51c2eb0dc2da936"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "dae438abc4cdd552bc7750ecebe958cbb7ef0edbb745d19e9b670db1e5c9fa8f"; } - { locale = "son"; arch = "linux-i686"; sha256 = "ef1baa4e6b333cd19df938dd13b91e091c9ed838b72767def2c0eec7a473532f"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "c2e45137b18717889977e0203951ddd078e1379f05875915f295b14677b6e75a"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "d4f48c90a2bd4f8751b66653e0aed0de3f4ff9b40bba306377577ef8cbf94541"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "85cf583913978c109dcaf07b22442505554813b6129862668ef78f491588a153"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "08725f28304608e029e9e4ccf0fb478eda4b6cde138ad65a53e2f88af97e8a6c"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "bfdca6d30f044bed181d45396c81f0a1d0e9b9026607e0700cc1bf225408ac20"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "01f98e4954e1a1df5b0aaf711696b6f7e7237ea3df57071479e8749c621fbbf1"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "b1c292410edaa4d6595b21b803287030d21ddd64e7a6a941d7627bb4cbff2435"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "d6d62857ccfe54ab870bcbe0ea98e41d59524b3958c28ddffcfb009d6305fde0"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "253080f66f47850222c676d98626c5a879ee708d1f03b3598d4ac205998676c4"; } - { locale = "te"; arch = "linux-i686"; sha256 = "ffa9371d8960707a0062bc6cb5ed5aa84c9e5b9b898ddc403b346b519bf6f814"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "69c3776bfd41bae4067da4f5f350c5f0a906c2b8d1edffe5d3907bc7ca2ee863"; } - { locale = "th"; arch = "linux-i686"; sha256 = "3dbead624ae46c14208a61ed8c6b515117d472a8f8bebf14478bc467da23eeee"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "4c0db90021ad46d67f68b3d2d928a279cdff14b7d62f8fa4e07a33135ab925b7"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "744327c6a3c514ff7b0bc5940f1744c95c6ac47165d5b316bbea11412a2d8550"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "321f096a89898ed027b95efa4f02fdaa9118eb414e35088ce259b76048bf77fd"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "f3d0a5a328b686cf18339e50a59920fe002166b35c5b5b29c04156bc5b5c6d4b"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "b15e82737c69703bcdd97f5699280338e4c2029b5eea7df98fb218a5e2a579f3"; } - { locale = "uz"; arch = "linux-i686"; sha256 = "dfdf28670cacfd43f71d81c609fc2961682ec2c7a64ea540e49a571195e68852"; } - { locale = "uz"; arch = "linux-x86_64"; sha256 = "eaacd1534711def0ab30eb9a53db2553c4cc202ec07c40bc5b2ded7e729347ac"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "4b4753038753d814d1e5a1ff995445abec80fd74d9443cac38495193bf039762"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "3051a5f8b0d47860f98839c4496298d71aeb6ef98f099937b8da9d87d7a1986c"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "2798bca7d894a0ba223694fe585e1b9fcf60cc96d881d7570c06a4d77afc4b20"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "acb1084e32bc467cd3374e6930c8f51deea38e94ddde09bf5a257d473d2579e8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "93a3f1b92aeb7a3e7659ebe0ad7c7df966279926fe3fdc7b0047bd858482234f"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "047d74546e4767d728e7522d908056c8aaad9cd8152517425443b59ff580bebe"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "b710126e2d7cd6f55b0dd54811de64c30eb69f97ea8a71905b3ea49e59abdfe2"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "d3b52404ab397385fcbb617f6cd8cda821d3927852e0a617dd60443c2cad6b65"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "3e925e9594f84e6bce3f24fa0a1207ec584818df4815ae04a6c882644e2f7cc6"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "c960352a5288f09752ff76440278e76700a1921109f0976b4d922ceeedec8e9c"; } + { locale = "af"; arch = "linux-i686"; sha256 = "3067a999cc678fe225c11288ed5659a251f237e098903b2cf6f23bdbceb70a9f"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "f329f7f3e15cd90263d70269c946f83bca01384618a59d590ca371930e7b1939"; } + { locale = "an"; arch = "linux-i686"; sha256 = "564ba48104a2db7709e4b9b25cf8d2853ef8a2b919a14030d7cc59751ac8ab8c"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "c2628a079e4c601d54c869d3b13ec1a772353885b29a63559aa544d5f48d4873"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "3097a13c59a324f3f9b7504b4941b1846cfbd5593c91597a2475fe87efbb61f7"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "b5778932fb122de9f7070393b4ae98e190e648857c94096a495e021a3c956a04"; } + { locale = "as"; arch = "linux-i686"; sha256 = "b6751bdaf612b8a975122812db0e7641eb5932e6c13879d7b48f2b7f5e8a2c6a"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "6501b0e3c4c55eef08e94dcd6f5fab70d01f88e57630f5a999279286fc9b1058"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "40b5f29d2a818e60d5ed1ef2f37ed5a65bf52b9138b2e4fd1c110b404fbf3910"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "6f9e6266d790784d57cab715d8d6fa5e648ec20287c8d6ad746972e284f5558b"; } + { locale = "az"; arch = "linux-i686"; sha256 = "005ca6c0184a9c5a2eee8d49b00782872abbe202c70654d856fd519ce62ea47a"; } + { locale = "az"; arch = "linux-x86_64"; sha256 = "32d5179de71be41b855d0454004e43d336289a6fe4967e869d0b9fb42fe2fe71"; } + { locale = "be"; arch = "linux-i686"; sha256 = "0fadc3acdd104cc171a18c74e11e853a9a322017f3f63b79712dc6628246630c"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "3fe751e0c702fc8a03f63cba1d1f2e0897b2f729c1b607f68f9934926a3343d8"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "80c49634c1b0acb2ee533ddd6581845270f05a3406cd7b41bf5962182166c000"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "12e74f5a3b8500f18126e305d49cf26290fb145d62d888bd00fd44b412dec105"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "22511d1c27f3876bbe7c4e791accdfa205e05cd3fc4143070f8e1e75521fa12e"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "239e59d26a842efd2ec61dcca73f7b6aadca6d4bb969e7447bf8ef2ed880a77c"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "72f72e6528c5d9e373e21065eba623cbbfc6c82e73db0df3581a1ffebe664cbd"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "580564e4a1e249a7cb6c83736343af43f903df82a97f8d2e19bd749e01867339"; } + { locale = "br"; arch = "linux-i686"; sha256 = "1dbc1d60e99812077b1b43a6f294e9c834db5b08ad67976290a5ea6f07d44c05"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "2c6524b05b9ab8da113066de6d6380cad29b681921c03486618dd2b6d10ca1ae"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "11b706f2621a8026e10de074f0cbcb6bab4a7b0a17d144640c8296ea35e92c95"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "e4ff831c617918c52b3b2a9e69a1f35f8b3e825f407cf6729d7e2b479860de29"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "1c2aefd0ab56bcfd619705aba70018873581c7482307c32842ffdb68ce441f10"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "47ab6aa2c474b9b04f246822c471548b2452559d04e4ec8cc099f3686729d285"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "f2c4028d562148ad39390853d388ed0617419e97bda55a0c6c47bf0e94145446"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "28d6eb534884b2c05afe87981b894c790fe57508b3e866cdcf341e1f9c51080c"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "684b11673d16778961115b990734888975267c3c253a8081519e53ae95df5798"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "d17294841995094d6395a4e65d50e5382e845d59e5949c952e96f4fe739d9bc4"; } + { locale = "da"; arch = "linux-i686"; sha256 = "4f2d29d52968c1b7a96af37beeee7150504bd3c32c4178a814ab0c4f86fe9644"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "65d01baab9e71a5a3d92124dbcc44c158277b273e8b6bcb302f853f61babde71"; } + { locale = "de"; arch = "linux-i686"; sha256 = "55af9ad39962559a48720c65f66d3bbab037ff30e777439428e2467a4559f039"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "835ea2e3757beb74c939296aa3d00092ff3f9d6d8805b64a267bcde28de0cb94"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "5b419a8f5e03257718237249be9c76eee759e46147d154bf994774139bb56be8"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "90d5dae350d65c6db8b156764ccdffe0f9951be29339a68db22018840c2247c1"; } + { locale = "el"; arch = "linux-i686"; sha256 = "77cc23059dc3b2956f3caf5802091ba48c4a42f5d86066f06282f82cb00845b7"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "daa2180f15708ec07902b639fe30cdb9c2c230622a92011e1065d24b706bbc62"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "15b084bfeac2e49a0d40b37a890321500eede1bed2edaa95cf3bba8981bb6a08"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "c5d17b6386dcae9cf88b2d80b38e921646936f253616104bec5a2fbb58d25fbd"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "6ef1fb2322cf448afe2c09b008eb2bab0c2efa94378b2ae9889bf83ac6f779af"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "4068eb3eb07e9798ddc1449186a1c60196bb6051ca7217f6bcee5da21e41c6c5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "4a61661b05ddd62f9e28ada0b39fe1a81cb5d737fa50d636561f79ec324e689c"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ddc551e2d8d0c50ba268ba1e8fd9ecbe52e05b0de0d1bb586045206a9e745a7a"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "236a9b6b632d1f30d63989f03783288eb8c1f144cae80b4549c0eded5dd95f1f"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "0f3a07a470e146891326ac36aa38b58018a4aa9ae668c8bbedc3b95c28d3fcb4"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "6feb23d97fa5a2356365d5779c18af5fc2a00b0e91c92a5127f4d576f916f7a1"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "5e2afba4834e6c44e8717090b832c76dfb5303617bc466be5299d579e9b298dc"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "3734590f319e8e281938dae65ad2e6fd7496c0c480123a6a819b3bb5d1489c69"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e0fcfccfe80dcc71a7d527539e42acfc6d6786a9e8491b426aab7fc3789c8cb6"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "126cf64e6f7754fe0ff8a97499ccd528896ad3bbd89296271609092ade68524a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c8dbda78bffec09d401b39b76d9684a03f47102955d04604cfc2e7ddb0315f2f"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "8f116ccad3093783476a60ea605e324b0046b84b59c9f858dc080d2e275cac51"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e6a9c775983e310d3ed8a98530860ce19e7a78df16dffb95e4735007fcf82a57"; } + { locale = "et"; arch = "linux-i686"; sha256 = "1b2b205731ce638823bd448b3d90e919d13e24b9b92e25eebef3766bac3e8330"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "97ecc57e21229d46d9d152d7821e860f3f2a53c10eda7caeb865af1919c6a0fe"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "5f0e7875993532ad234fe7af2a191619e308be726ed6ae8be01afc79f8c5f3c8"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "bf2a52f3fce8ff4142cb1346cb5ce0f8b51959755698377db0807bc1e87e01eb"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "12d593a12a0fcfcd720a6a5324b349c139f6e6759b111dab869e851241736e28"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "29cb4531e485af7dae2a45a1b9a0620292eaa2764b4cd24504bce0e54c8b71ae"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "d67f9937780713ed4c130713239254a1e0d3918f2d2f528b74651b413e281cbf"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "140b199b0ce0a32fcf363946c942d733b587d9569c75f2dbab19161385f12d9b"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "586346c2bc47b1b2693d03e4f2fe3b36de00966244120272426c597b94044595"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "160d0036392cb38de1a7e15ba9d0d1acf0538ff1b575ab1d1df11d187c5ac74d"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "f33b267d223d704beef813d0c7c8ab534152373435ef04db3b039ad56b02c556"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "c141b154d5c56eefd94bfe7e391d0fa4027cee6685820e8be304c801d7064c65"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "2fff2f173cf6008b7bc17cad2ce16a43901f8484f3eb2700368acd64f98f075b"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "88227c796a82290c27b97cb27d8f606f1982115eb5724fe4a6169056ac000816"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "f9deacaf81e46267fd1d7297149e9f7e330bc2a58981cd65857c6add5eef6402"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c376d517de3aad4152c0d5dceb8ef1a2deef1213e568404f06163f9d4adbe777"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "f4f11f104fe964196e1588b1cddf5a43c5a8591d41ec7baf365264562240d5be"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "40993cbe7c6a42c467868e8cd60eb67aa8d0b7357617f5babb415cc3ffd608e9"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "23c4a4a47fe7150c70f8489921b756ada22e45140e01d6817f9145de32b4d35a"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "d3fa81ba627c6e75fea42715d8dc4c5fdbed841429a0493081f915623ad603c4"; } + { locale = "gn"; arch = "linux-i686"; sha256 = "ebbf6f05f6b61a6ecb7f5c91ca4a6b87824edced41777fe35293b5ba6836a6cf"; } + { locale = "gn"; arch = "linux-x86_64"; sha256 = "d9917c8dc1d236e569d040db1512872ce145af934ee3fad7a7e2d5a9a845a856"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "598f3feaa412fa85619fd60ca1a48b2a691867d8aab92b39d98d12a3ebee2253"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "f238f84dcc0f41f99073aa4c7bff1fd2dc5f896fb1b9cae00d9d21d199383879"; } + { locale = "he"; arch = "linux-i686"; sha256 = "22aacab2263a799f5503e6d73d76c6c7e8c3f2d39d9a8945d7e062e4078f4eea"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "6288418353ab0d51ba8b7a02a302e68dc3b26e5565cb14e50316e5300cb2f696"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2ee18b7653f9edf926ff7927d24c04e9aba503174b4fa773a136fd3e29a256db"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "3f18f821cbc4781a9e6d84e54e0a70e2cdd18bcb61342922b1402a3eabb75839"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "c8633fb837adf08b257d19b88e9e5d35c2b24a658da7088a3902b4b9b833e7dd"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "714fcde1e42db06a9083946bb929a182891aadfd249bf5b63aa7f6ca744bcf0b"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "7f86d45ceb3f551b5b371047bbcccf9a75fe2f99df632b42d838419ee0c6d757"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "add010dbfe8a842c16a8dceb019675e04acb7b8de6d952d4b4faa2a368d37f1d"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "cc994b9cfb60517062ce3570839b5e76def0a385b4e8793156d6a4719dd707b3"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "a36d229286d5422dd15d5e0f33e7fb99f6ddff3db4efabc3be244fa26c7bd24d"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "508a5d85df7508c453a991e4a9679b31270da70983607cd9d127a8e432728a3c"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e21375aa7d5351a841ba05c8b0d921af1f334d37f714ed3c4303e90b5d4e34aa"; } + { locale = "id"; arch = "linux-i686"; sha256 = "58d7e3a898f5ae05bc7b0e99e83d8a39a7f5f935a086081af4a9d7ea98b927a3"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "c4b803b519780a0fd5a43fd23a3aef81d4197e860ad8e2908c5ddf2b76f538c3"; } + { locale = "is"; arch = "linux-i686"; sha256 = "a9fd41eb35ed7430915d9b09807555af1d8d81f5520deb4aae58e38edf3ca11a"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "74c6a4183f32043fcb6a3b52c71e8a23b36fc1381caff0dae8366cd80af391dc"; } + { locale = "it"; arch = "linux-i686"; sha256 = "b6d615f519b7664acb335a305d99bd6c6eb7db98eb29c7957b073fbeb468d63a"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "f65370cd57b1a885169447cc0b879dde715c58309db49f6c268db5113952a05f"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "1b3766bd19c8841922cbe1e3a8144d9efe5ab4a3c9b2fe216811caff54607704"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "68e14f495852e023534bce66626287621a7155464fd56bbe41b38b5bc7305341"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "4a72592497d392d4f749733eeaa7964a95fcc3de007127ec198ac86f6a266382"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "9d6333875c11425a467a32ebf649b7577462920592155ed54ec6130ce76073a0"; } + { locale = "km"; arch = "linux-i686"; sha256 = "e380caedd69287569274115aa4cee7b8d2187050d9f65a10ae36c9d48fd1d007"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "95794fa36975d732987012d406770710985c270c8f4e4c99407711d16279d941"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "b0cd3f0c6da99b3e86ec4b08b962abb0d823329460e87761733db5d7987f1e5d"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "47399283f7b395c5079b592c83a93487a17a2cab0e68d35c54aa6e5e647d2c66"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "5f9b1c691d9c9a99dd280e3fff8df813aeeefe42ce5273ddf2848352bfde44f6"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "360c82f93b7f529173f9259a4f475595d0ec4dc4b63b6ac46785bccd549e3dbd"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "29f2d93c1f6695c22d4e766ee049bbe4f6fb034e22c12be407062db3deb0805c"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "c47c6e13b44b8560487f39c6f668fc03ea42bf848fcb9926cf8e0e0014218fc3"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "5915cf516690de51021eeccc66cce8142fee7882efd7add7a0bfaa5b04d65dbf"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "04673232b52aae6b34b87b6a2638ad653a4e81430d21998919a56dbde10febd7"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "6648a4a4b8be23ed6fb64efc0bb3e49c1807b5408d2df19d45a3b098b9bb605d"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "769020e490b9b74608cbbb319254694f7a32c62b6397ff8c563fa27a33cbe16b"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "5646fac52682c1053e7b58fa0b13fcf74c8b79e344ffa3a9614fa2509ef2b38d"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "eb5db15e6584a5272d9c496d29ce4f500811ed4b49277b93ae432498aef80d0f"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "8430792262871155bf07b652c5f8ae5408b0bb16fd9e6548010e86b2a1d604d0"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "273812699d47c99f20d18fdcf547cd9c5386a4d8049dcb93e34c0303a9aae7a5"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "bc3b9905214fde7623aa5567f6a6792b2c5cb32fde1172ad60b108a42a372c24"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "0e21ef50fd3ecb301d0a62baf3e084723c0cc05c3a9569ce08ccf2698f40a526"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "fb83926aa70735befc1c8c79c950a9dbb01344dfceff82aefa7640e79f659139"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "ae6622f7cb9261985d8cc0bf06af9a51d7d8b391386aded9bf07576be60c5f12"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "16b35b29882238095475719a4f8cecd5e49a8e50bfe5c2b943c604274cfb02ae"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "04e390cdeabc686eee093ae2280628375b706c2b09b9aa29e788bc1663b21ad0"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "b3b931e5a38fc71aee2dc2290adb600b0d8e56923c30c748bacbbf527e2e8960"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "4d3c6f639e8c6579c525c6e8c5bd036b3c6abe0e2d14ee0596ac207b3f291f84"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "40cc8d419bc536e2826766dbd9b3e58bb98730ed38926387bcadcc5b30c8b742"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "4595b76ab812dd9ed16405d0863225c0d6f40dd70a96baee2632a5f8e4d2aab5"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "8cad1d60633dfb059c4e29b3a226397822ed10938909dd783b9b8c7bac0e8866"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "d0ac3c7ff26c4747222f2d7a1d5b4b69a861dee261ad338ed88ab8b35cf44ffc"; } + { locale = "or"; arch = "linux-i686"; sha256 = "b05473429fb2b844d96ee88108891e5cdc13c56526017ff6db1909ff60dbe1b5"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "406816e487831cd9a928fd9c140290f53d4a9575024adf71e1565d24e573abdc"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "beb60cd44b31c3c1ebfae25efb17d78d001f0009bb5a8304e319791ae535daa0"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "1abab6f91bd2ff22cd6d9075bcb83ddf6a190291997e5d379eff53fc10fd8c5e"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "65ceeb5cfeaa7d2c246ba3d152ea1fb892a7d50eafd46da2f41d7ec0a4efa759"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "d3565007522b0e3a4de15b913c8f1c9421d1d9614fa4f2d6657a4af730f26c87"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "7a0593b15eac64c1261e413f4a22ca2cbb5f489530ae72a637de9bc0de99f2be"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "243c12ea35617336d307d8040d1bee1a1827f3c8815e78185e5d5f8c2b58a5d6"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "ed06f6d30204728089609114c5d08a8b2346ca024d6e5743179d0f2f0da753bf"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "65cf06f13ce3930b4c6b645e0fa442003d41a3ff99d4ff6ad06039c806bf9815"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "5b230c43a6b56c4052e054d117c2c80450b36d52b166ac3a9c9e3d13b336e44b"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "341495282263ce7293350c3623d25a6fc7952429bbc36316687be402831c4376"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "12940db350559cc1ef5dd148f2fd34cb4f445fbd1928d0d8dac6e57b0186e08e"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "a53c18fcf239dce6a49a44bbb42a210b6161f5d21e64e9e33096e36b7a187bf2"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "823ecb8bb5b772e896b51bf23ac1fa271b02c1abba9fb4c679c687586047db0b"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "fd4e34dd08c5f712c68826710496ac4eab262a4356e06a02718b27dd8c65d35b"; } + { locale = "si"; arch = "linux-i686"; sha256 = "6cc4f9828e366d59a86922292ca8878ef4bb6cee9ee5316b8733d0704dc6f390"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "ed3c28af72df9960b08071d181b1d097d0326a0cd6eaae673866083f87db18f5"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "cfa4b71bb7acdaa689a28f8aa58f7f9375c7d7e4301cce0aea0eccc60d897d2f"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "736ff619f9d9848d202fe9eaa56b6a29e37e47589282adf7d97f8d7103edecfe"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "c8af219be7f7cc7f878425b446b1c02838f651e64a0fcbfae4ec818326927097"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "d3309efc0b469e9d24e7e01216b52b31ad854653f3904c76fd136d615d75609b"; } + { locale = "son"; arch = "linux-i686"; sha256 = "fdc1e500f8499b648cf0fd3d99601cfcd0f7d89ae09d800520793751a6b32fee"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "e1f7038aa136492e3d296b9ff50a3f815f4b587944783ea0ea607717788cb48b"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "c6881862ff53402d427d998c59a741c4abd9b2713c1fbbc5315b140d02445507"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "2a83117de89e2b9036c0f7fde6617d9f55fef4955432cd566692e7a2829b1128"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "f214aa32eef11535a73449d7f2626c90b1ce78e469d96c8cc6cd53979582197b"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "9931d18c18a785569aade6fd233d3c34910ece758f3355b694b553ce6c5dae7a"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "cd5695110c90744a1b750d34c7294f1109b5c7829025eb28101b6ead5bbbcb3d"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "f52fe8f60420171385638a9de46b2b11c03b13239a17ef9fb4f7305774bab664"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "8910a680bc6a6e58433686a020916b072e0d5d95e896cb7fa5a212c00ee20b93"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "ae727422e4b7cb2de2b098f6b4adedb2dc788b57eda7ec2ee7ac2d60b645ee64"; } + { locale = "te"; arch = "linux-i686"; sha256 = "0088dcb813864a4e231afd10d4aefca656131a3589b316721e2d87cb29a78dbf"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "6ef6aa557e691324072d201ad7876dd4d2417dfaaab08d3bfa4620c4626d1380"; } + { locale = "th"; arch = "linux-i686"; sha256 = "da72450d756950635c0b2d95285b5d998aeddd60b43d9ca98ac4b1b707289a96"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "89ac8220a7be503ecae8dd5a241df4654b93adfac6f431f08b83bb5f7f63de7f"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "64b3e853efe96d75282e0a9ca78db876c3f03b609be0acb551d1d6a7b50e116b"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "fe01dcbfe855e661c79ec63c80098d18c1a051c85fc3fb27ac3df8b9c6d1df92"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "1052bb8de8acd200dfed598f5afc1c87a55772b89b2f2ec59b710af1d1bfea90"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "986d01b61e36188f1293ee7ab1198f2583605469174e2dd9ead8eec241480cec"; } + { locale = "uz"; arch = "linux-i686"; sha256 = "b114d4696cf20320ec71c7ff92ac2d6477784e4f0c9f15a54701473a469e4667"; } + { locale = "uz"; arch = "linux-x86_64"; sha256 = "19fdc20d1b6a5b556856ad4d43d05cd7ae4bbd0207d326c9f2b0a4a0e3f9425b"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "ec48f6eb7b3fba76d07a4ff4192fe28b4faeaf7dfa2317453f1266dd4cb5e66f"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "89a9c826522dece360abc207260b6a71955d1c86f8f0b783e3013d4c7d5edfdb"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "4671201bd924bfb4e290bdd5247b5d972b2dff986db0dd21b26ee0d30f94566f"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "f381cc509369405e7a06c78c07de3ee01f8b0cf66d3300cfb10f27cab14d34b0"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "abaac014c04bd29dcb5617c489d4b047522f6ede9139781b04c0a73ff20a19a4"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "5da12cc28e6bad8739a0050410efb1ca22d46a42c33fed312acca29e89de007b"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "7279f9ba36dfa988ffade1f54e4f2dcced30be5fab48476d5b6d20d989204274"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "e943d7736ec12d269512363d20d5b2a2e8c740c81a764f44f308d497fe95f0ea"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 552c8d4d822e2..7493350b28f45 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -18,14 +18,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; let -common = { pname, version, sha256 }: stdenv.mkDerivation rec { +common = { pname, version, sha512 }: stdenv.mkDerivation rec { name = "${pname}-unwrapped-${version}"; src = fetchurl { url = let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2"; in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}"; - inherit sha256; + inherit sha512; }; buildInputs = @@ -130,14 +130,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "45.0.1"; - sha256 = "1j6raz51zcj2hxk0spk5zq8xzxi5nlxxm60dpnb7cs6dv334m0fi"; + version = "45.0.2"; + sha512 = "8c0b7afb41a1a405fe499299d1a8b1138dac52b9ad67bfc8761b70a26f330581c2aa1d76d67075896ec3a0c3f5367b8b58365ebc8b3a01f801fa37071b3de526"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.0.1esr"; - sha256 = "0rkk3cr3r7v5xzbcqhyx8b633v4a16ika0wk46p0ichh9n5mci0s"; + version = "45.0.2esr"; + sha512 = "a1e9e9371ee47181b01252d60166c405a7835063dffb4928dfb8abb9f151edd8db1dd2b59f35d7898f1660a0fcd8e41f91a3e799c25b6dd43b6ab056bc5ad6bf"; }; } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index eb51fa5c10209..77f0d1693da3a 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -7,7 +7,7 @@ , dbus_libs, gtk, gdk_pixbuf, gcc # Will crash without. -, udev +, libudev # Loaded at runtime. , libexif @@ -39,21 +39,18 @@ let withCustomModes = true; }; - env = buildEnv { - name = "google-chrome-env"; - paths = [ - glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr - libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite - alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk gdk_pixbuf gcc - udev - libexif - liberation_ttf curl utillinux xdg_utils wget - flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap - ] - ++ optional pulseSupport libpulseaudio; - }; + deps = [ + stdenv.cc.cc + glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr + libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite + alsaLib libXdamage libXtst libXrandr expat cups + dbus_libs gtk gdk_pixbuf gcc + libudev + libexif + liberation_ttf curl utillinux xdg_utils wget + flac harfbuzz icu libpng opusWithCustomModes snappy speechd + bzip2 libcap + ] ++ optional pulseSupport libpulseaudio; in stdenv.mkDerivation rec { inherit version; @@ -61,13 +58,16 @@ in stdenv.mkDerivation rec { src = binary; - buildInputs = [ env patchelf ]; + buildInputs = [ patchelf ]; unpackPhase = '' ar x $src tar xf data.tar.xz ''; + rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps; + binpath = makeBinPath deps; + installPhase = '' case ${channel} in beta) appname=chrome-beta dist=beta ;; @@ -76,7 +76,6 @@ in stdenv.mkDerivation rec { esac exe=$out/bin/google-chrome-$dist - rpath="${env}/lib:${env}/lib64" mkdir -p $out/bin $out/share @@ -103,7 +102,7 @@ in stdenv.mkDerivation rec { cat > $exe << EOF #!${bash}/bin/sh export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${env}/bin\''${PATH:+:\$PATH} + export PATH=$binpath\''${PATH:+:\$PATH} $out/share/google/$appname/google-$appname "\$@" EOF chmod +x $exe diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index 0e962f5fc1f66..ce9b944090728 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index a3edaad37d40b..2777cb15fca93 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { in '' make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install wrapProgram $out/bin/luakit \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ --set LUA_PATH '"${luaKitPath};${luaPath};"' \ diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 9eaf254b23b58..23ed0bc2c1ea0 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/midori \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; } 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 2b6b0d5b41236..d1a00f1bd0440 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,6 +36,13 @@ }: +/* When updating this package, test that the following derivations build: + + * flashplayer + * flashplayer-standalone + * flashplayer-standalone-debugger +*/ + let arch = if stdenv.system == "x86_64-linux" then @@ -49,66 +56,59 @@ let suffix = if stdenv.system == "x86_64-linux" then if debug then throw "no x86_64 debugging version available" - else "-release.x86_64" + else "_linux.x86_64" else if stdenv.system == "i686-linux" then if debug then "_linux_debug.i386" else "_linux.i386" else throw "Flash Player is not supported on this platform"; + saname = + if debug then "flashplayerdebugger" + else "flashplayer"; + is-i686 = (stdenv.system == "i686-linux"); in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.577"; + version = "11.2.202.616"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j"; + sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; postUnpack = '' - pushd $sourceRoot - tar -xvzf *${arch}/*${suffix}.tar.gz + cd *${arch} - ${ lib.optionalString is-i686 '' - tar -xvzf */*_sa.*.tar.gz - tar -xvzf */*_sa_debug.*.tar.gz - ''} + tar -xvzf *${suffix}.tar.gz - popd + ${lib.optionalString is-i686 '' + tar -xvzf *_sa[_.]*.tar.gz + ''} ''; - sourceRoot = "fp_${version}_archive"; - dontStrip = true; dontPatchELF = true; - outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ]; + outputs = [ "out" ] ++ lib.optional is-i686 "sa"; installPhase = '' mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so - - ${ lib.optionalString is-i686 '' - mkdir -p $sa/bin - cp flashplayer $sa/bin/ - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $sa/bin/flashplayer + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so - mkdir -p $saDbg/bin - cp flashplayerdebugger $saDbg/bin/ + ${lib.optionalString is-i686 '' + install -Dm755 ${saname} $sa/bin/flashplayer - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $saDbg/bin/flashplayerdebugger + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $sa/bin/flashplayer ''} ''; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { mozillaPlugin = "/lib/mozilla/plugins"; }; - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ zlib alsaLib curl nspr fontconfig freetype expat libX11 libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf libvdpau nss diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index ba40925e1d1eb..f59de7db9f5c0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # !!! fix this preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr.dev}/include/nspr" echo $NIX_CFLAGS_COMPILE ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 6fd953636a83c..f35e88ae89e61 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, libpulseaudio, udev, pango +, dbus_glib, alsaLib, libpulseaudio, libudev, pango }: with stdenv.lib; @@ -36,7 +36,7 @@ let alsaLib libpulseaudio dbus_glib - udev + libudev curl pango cairo diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 51511621dce6d..85012f8f7091f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl}: +{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl, libXt}: let srcData = # Generated upstream information rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { export configureFlags="$configureFlags --target-cpu=$(uname -m)" ''; - buildInputs = [which pkgconfig file glib gtk2 gtk3 curl]; + buildInputs = [which pkgconfig file glib gtk2 gtk3 curl libXt]; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ab199ff97cdfe..325e855ec72e7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); preFixup = '' @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postFixup = '' oldRPATH=`patchelf --print-rpath $out/lib/opera/opera` - patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera + patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1be28829e3512..93aff9498df79 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: -let version = "0.5.1"; in +let version = "0.6.1"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb"; + sha256 = "1xb95yjc390h7f75l1jk252qiwcamgz2bls2978mmjkhf5hm3jm0"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 7bbe84847f250..fcaaec63b9e69 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/surf" \ - --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \ + --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 9e3b44f4083dd..0fb0db9989142 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" done diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index cfbaa908902d8..ddaaa68f60d4a 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 2415c06dba42a..e2d5061b92e42 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimprobable2" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix new file mode 100644 index 0000000000000..7c3c167cf32d1 --- /dev/null +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE +, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr +, alsaLib, dbus_libs, cups, libexif, ffmpeg, libudev +, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp +, libuuid, xz +, gstreamer, gst_plugins_base, libxml2 +, glib, gtk, pango, gdk_pixbuf, cairo, atk, gnome3 +, nss, nspr +, patchelf +}: + +let + archUrl = name: arch: "https://vivaldi.com/download/stable/${name}_${arch}.deb"; +in +stdenv.mkDerivation rec { + version = "1.0"; + debversion = "stable_1.0.435.40-1"; + product = "vivaldi"; + name = "${product}-${version}"; + + src = if stdenv.system == "x86_64-linux" + then fetchurl { + url = archUrl "vivaldi-${debversion}" "amd64"; + sha256 = "12c051a40258a95f9594eed2f73fa5f591482ac2a41d5cf643811b1ea2a1efbf"; + } + else if stdenv.system == "i686-linux" + then fetchurl { + url = archUrl "vivaldi-${debversion}" "i386"; + sha256 = "6e0b84fba38211bab9a71bc10e97398fca77c0acd82791923c1d432b20846f0f"; + } + else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; + + unpackPhase = '' + ar vx ${src} + tar -xvf data.tar.xz + ''; + + buildInputs = + [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE + libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr + atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg libudev + freetype fontconfig libXrender libuuid expat glib nss nspr + gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf + patchelf + ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + + buildPhase = '' + echo "Patching Vivaldi binaries" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + opt/vivaldi/vivaldi-bin + echo "Finished patching Vivaldi binaries" + ''; + + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p "$out" + cp -r opt "$out" + mkdir "$out/bin" + ln -s "$out/opt/vivaldi/vivaldi" "$out/bin/vivaldi" + ''; + + meta = with stdenv.lib; { + description = "A Browser for our Friends, powerful and personal"; + homepage = "https://vivaldi.com"; + license = licenses.unfree; + maintainers = with maintainers; [ otwieracz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix index 0ec2f5ac87a0b..21dc237397755 100644 --- a/pkgs/applications/networking/copy-com/default.nix +++ b/pkgs/applications/networking/copy-com/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation { for binary in Copy{Agent,Console,Cmd}; do binary="$out/${appdir}/$binary" ln -sv "$binary" "$out/bin" - patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} "$binary" + patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} "$binary" done RPATH=${libPaths}:$out/${appdir} diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index ab79159ea6e1e..892d8fa330093 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = '' - mkdir -p "$out/bin/" + mkdir -p "$out/bin/" "$out/share/applications" + cp data/dropbox.desktop "$out/share/applications" substitute "dropbox.in" "$out/bin/dropbox" \ --replace '@PACKAGE_VERSION@' ${version} \ --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ @@ -24,7 +25,6 @@ stdenv.mkDerivation { --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* - mv $out/bin/dropbox $out/bin/dropbox-cli patchShebangs "$out/bin" ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index a180e2a01edbf..d27a6a7b84918 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -20,11 +20,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.14.7"; + version = "3.18.1"; sha256 = { - "x86_64-linux" = "1pwmghpr0kyca2biysyk90kk9k6ffv4i95vs5rq96vc0zbckws6n"; - "i686-linux" = "08yqrxh09cfd80kbiq1f2sirx9s85acij4khpklvvwrnf2x1i1zm"; + "x86_64-linux" = "1qdahr8xzk3zrrv89335l3aa2gfgjn1ymfixj9zgipv34grkjghm"; + "i686-linux" = "015bjkr2dwyac410i398qm1v60rqln539wcj5f25q776haycbcji"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -36,7 +36,7 @@ let # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - ldpath = stdenv.lib.makeSearchPath "lib" + ldpath = stdenv.lib.makeLibraryPath [ dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu ncurses popt qtbase qtdeclarative qtwebkit zlib diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index a254535dd703c..99196cdf796b9 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = - "-I${libxml2}/include/libxml2 -I${json-c-0-11}/include/json-c"; + "-I${libxml2.dev}/include/libxml2 -I${json-c-0-11}/include/json-c"; NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson"; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 56341b64d6ce2..5ea0975e15f37 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib" done ''; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 2935979ebb9aa..782c801356e32 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.17"; + version = "0.4.18"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "106nagdyayyxj3q68bs3fsps5wnwzjh82vcmy98fp42j33q6yzny"; + sha256 = "1qgmw0261y89zka9dgqzvirfk3bg8p5b929vqm1418859mw9i87a"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 8076b27d1c542..d2a08b98c0760 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/blink \ - --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib + --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" cp "$desktopItem"/share/applications/* "$out/share/applications" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a072c4a5d767b..86b21f90ad9e8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf , glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango -, udev }: +, libudev }: let version = "0.0.1"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss pango udev + libXtst nspr nss pango libudev ]; installPhase = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation { ln -s $out/DiscordCanary $out/bin/ # Putting udev in the path won't work :( - ln -s ${udev}/lib/libudev.so.1 $out + ln -s ${libudev}/lib/libudev.so.1 $out ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6449c9d3d1a52..b57b3394eea7f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -6,7 +6,7 @@ let version = "4.0.1631"; - rpath = stdenv.lib.makeSearchPath "lib" [ + rpath = stdenv.lib.makeLibraryPath [ xorg.libXext xorg.libSM xorg.libICE diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 2ab0930842bc0..bec367818e2ff 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -43,7 +43,7 @@ rec { '' ["minInit" "doUnpack"]; setVars=a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" ''; cmakeBuildDir="cmake-build"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 7e9e41ea0bfc4..e7266a93350be 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { patches = [./pidgin-makefile.patch ./add-search-path.patch ]; configureFlags = [ - "--with-nspr-includes=${nspr}/include/nspr" - "--with-nspr-libs=${nspr}/lib" - "--with-nss-includes=${nss}/include/nss" - "--with-nss-libs=${nss}/lib" - "--with-ncurses-headers=${ncurses}/include" + "--with-nspr-includes=${nspr.dev}/include/nspr" + "--with-nspr-libs=${nspr.out}/lib" + "--with-nss-includes=${nss.dev}/include/nss" + "--with-nss-libs=${nss.out}/lib" + "--with-ncurses-headers=${ncurses.dev}/include" "--disable-meanwhile" "--disable-nm" "--disable-tcl" diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index c19b5ff31f9d1..17462cb75ad57 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/pybitmessage \ --replace "exec python2" "exec ${python}/bin/python" \ - --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/" + --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" wrapProgram $out/bin/pybitmessage \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index 8b259c90fe508..7322ff2bb345a 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -40,7 +40,7 @@ rec { cd .. ''; - configureFlags = "--with-expat --with-expat-inc=${expat}/include " + + configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " + "--with-expat-lib=-lexpat --with-opus "; buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 98672a29d0b63..2f2dba18e49ef 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Fixup desktop file substituteInPlace skype.desktop --replace \ - "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_48x48.png" + "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png" substituteInPlace skype.desktop --replace \ "Terminal=0" "Terminal=false" mkdir -p $out/share/applications diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index c6e550b5e8fdf..d0f0dd3149c98 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,9 +4,9 @@ let - version = "2.0.1"; + version = "2.0.3"; - rpath = stdenv.lib.makeSearchPath "lib" [ + rpath = stdenv.lib.makeLibraryPath [ alsaLib atk cairo @@ -23,6 +23,7 @@ let libnotify nspr nss + stdenv.cc.cc systemd xorg.libX11 @@ -41,7 +42,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "12d84e61ba366cc5bac105b3f9930f2dfdd64c1e5fabbb08a6877e1c98bfb9c7"; + sha256 = "0pp8n1w9kmh3pph5kc6akdswl3z2lqwryjg9d267wgj62mslr3cg"; } else throw "Slack is not supported on ${stdenv.system}"; @@ -57,23 +58,24 @@ in stdenv.mkDerivation { mkdir -p $out dpkg -x $src $out cp -av $out/usr/* $out - rm -rf $out/usr + rm -rf $out/usr $out/share/lintian # Otherwise it looks "suspicious" chmod -R g-w $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/slack $file || true + patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done # Fix the symlink rm $out/bin/slack - ln -s $out/share/slack/slack $out/bin/slack + ln -s $out/lib/slack/slack $out/bin/slack # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ - --replace /usr/share/slack/slack $out/share/slack/slack + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/ $out/share/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 29a0f188516f0..07bfcf3a03e02 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configurePhase = "qmake -r PREFIX=$out"; + configurePhase = '' + runHook preConfigure + qmake -r PREFIX=$out + runHook postConfigure + ''; fixupPhase = '' wrapQtProgram $out/bin/cutegram \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 206b2a0747636..470724876ed95 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure qmake -r PREFIX=$out + runHook postConfigure ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 2422d18086977..77a0d9ee0aac5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -48,10 +48,10 @@ in stdenv.mkDerivation rec { "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" "INCLUDEPATH+=${gtk2}/include/gtk-2.0" "INCLUDEPATH+=${glib}/include/glib-2.0" - "INCLUDEPATH+=${glib}/lib/glib-2.0/include" + "INCLUDEPATH+=${glib.out}/lib/glib-2.0/include" "INCLUDEPATH+=${cairo}/include/cairo" "INCLUDEPATH+=${pango}/include/pango-1.0" - "INCLUDEPATH+=${gtk2}/lib/gtk-2.0/include" + "INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include" "INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0" "INCLUDEPATH+=${atk}/include/atk-1.0" "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 372531f658e5c..5412b0db4d6b8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure qmake -r PREFIX=$out BUILD_MODE+=lib + runHook postConfigure ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 532d68ad66050..84ced8f62c6ee 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -11,11 +11,11 @@ let call_ui = x : x // { NIX_CFLAGS_COMPILE = "-I${telepathy_glib}/include/telepathy-1.0" - + " -I${dbus_glib}/include/dbus-1.0" - + " -I${dbus_libs}/include/dbus-1.0"; + + " -I${dbus_glib.dev}/include/dbus-1.0" + + " -I${dbus_libs.dev}/include/dbus-1.0"; }; telepathy_logger_qt = x : x // { - NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_libs.dev}/include/dbus-1.0"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 173dfe9c929f1..aaff39ccb44d1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool gobjectIntrospection dbus_libs ]; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 312fd8df908a9..4d2605acdc9e7 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; configurePhase = '' + runHook preConfigure export QMAKEFEATURES=${libcommuni}/features qmake -r \ COMMUNI_INSTALL_PREFIX=$out \ @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { COMMUNI_INSTALL_ICONS=$out/share/icons/hicolor \ COMMUNI_INSTALL_DESKTOP=$out/share/applications \ COMMUNI_INSTALL_THEMES=$out/share/communi/themes + runHook postConfigure ''; postInstall = '' diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index d6b57b6cb0d7b..a467cead17c47 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://irssi.org; + description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; }; diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix new file mode 100644 index 0000000000000..f36bbc0006418 --- /dev/null +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, openssl }: + +with stdenv; +with stdenv.lib; + +mkDerivation rec { + name = "wraith-${version}"; + version = "1.4.6"; + src = fetchurl { + url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; + sha256 = "0vb2hbjmwh040f5yhxvwcfxvgxa0q9zdy9vvddydn8zn782d7wl8"; + }; + buildInputs = [ openssl ]; + patches = [ ./dlopen.patch ]; + postPatch = '' + substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl} + substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl} + ''; + configureFlags = "--with-openssl=${openssl}"; + installPhase = '' + mkdir -p $out/bin + cp -a wraith $out/bin/wraith + ln -s wraith $out/bin/hub + ''; + + meta = { + description = "An IRC channel management bot written purely in C/C++"; + longDescription = '' + Wraith is an IRC channel management bot written purely in C/C++. It has + been in development since late 2003. It is based on Eggdrop 1.6.12 but has + since evolved into something much different at its core. TCL and loadable + modules are currently not supported. + + Maintainer's Notes: + Copy the binary out of the store before running it with the -C option to + configure it. See https://github.com/wraith/wraith/wiki/GettingStarted . + + The binary will not run when moved onto non-NixOS systems; use patchelf + to fix its runtime dependenices. + ''; + homepage = http://wraith.botpack.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/pkgs/applications/networking/irc/wraith/dlopen.patch new file mode 100644 index 0000000000000..bfc854ef9e9c3 --- /dev/null +++ b/pkgs/applications/networking/irc/wraith/dlopen.patch @@ -0,0 +1,48 @@ +diff --git a/src/libcrypto.cc b/src/libcrypto.cc +index 0339258..68746c8 100644 +--- a/src/libcrypto.cc ++++ b/src/libcrypto.cc +@@ -95,17 +95,9 @@ int load_libcrypto() { + } + + sdprintf("Loading libcrypto"); ++ dlerror(); // Clear Errors ++ libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL); + +- bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.0.9.8 libcrypto.so.7 libcrypto.so.6").split(' ')); +- +- for (size_t i = 0; i < libs_list.length(); ++i) { +- dlerror(); // Clear Errors +- libcrypto_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY|RTLD_GLOBAL); +- if (libcrypto_handle) { +- sdprintf("Found libcrypto: %s", bd::String(libs_list[i]).c_str()); +- break; +- } +- } + if (!libcrypto_handle) { + fprintf(stderr, STR("Unable to find libcrypto\n")); + return(1); +diff --git a/src/libssl.cc b/src/libssl.cc +index b432c7b..8940998 100644 +--- a/src/libssl.cc ++++ b/src/libssl.cc +@@ -68,17 +68,9 @@ int load_libssl() { + } + + sdprintf("Loading libssl"); ++ dlerror(); // Clear Errors ++ libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY); + +- bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.0.9.8 libssl.so.7 libssl.so.6").split(' ')); +- +- for (size_t i = 0; i < libs_list.length(); ++i) { +- dlerror(); // Clear Errors +- libssl_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY); +- if (libssl_handle) { +- sdprintf("Found libssl: %s", bd::String(libs_list[i]).c_str()); +- break; +- } +- } + if (!libssl_handle) { + fprintf(stderr, STR("Unable to find libssl\n")); + return(1); diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 76de1d208cc00..4cbc5c8c79670 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { rm -fr qwt-lib ''; - configurePhase = "qmake linssid.pro"; + configurePhase = '' + runHook preConfigure + qmake linssid.pro + runHook postConfigure + ''; meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 0ace6a01b3f32..5936ae6e878ec 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin" + --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix new file mode 100644 index 0000000000000..f4718e1ee745b --- /dev/null +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, which, autoconf, automake, ncurses, perl +, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: + +stdenv.mkDerivation rec { + version = "20160416"; + name = "neomutt-${version}"; + + src = fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt"; + rev = "neomutt-${version}"; + sha256 = "1sgc77fyjcf859y896w208fw4rxd0bzhp0c7cp3vacb7lqr07ngb"; + }; + + buildInputs = + [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses + notmuch which openssl perl ]; + + configureFlags = [ + "--enable-debug" + "--enable-gpgme" + "--enable-hcache" + "--enable-imap" + "--enable-notmuch" + "--enable-pgp" + "--enable-pop" + "--enable-sidebar" + "--enable-smtp" + "--with-homespool=mailbox" + "--with-gss" + "--with-mailpath=" + "--with-ssl" + "--with-sasl" + "--with-curses" + "--with-regex" + "--with-idn" + + # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail + "ac_cv_path_SENDMAIL=sendmail" + ]; + + configureScript = "./prepare"; + + meta = with stdenv.lib; { + description = "A small but very powerful text-based mail client"; + homepage = http://www.neomutt.org; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ hiberno cstrahan ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 388fc418de15c..bbb51c7c18659 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPath "lib64" [ + ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 781e2d27e55ab..936481472a997 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb > sources.nix { - version = "38.7.2"; + version = "45.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha256 = "63cdb91df96bc132e0b9b6c702cdc82b9583a58be11863c76c0a1a04b689b1ed"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "d1dc64cc1ca886b81da71e132b31644d89b8f61b4fab5f886c00b3b8defcd49a"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "b71ee84b0e56d7dd9b4cb40032055c8c1f8b4c18e9d679d84b71c226c928a189"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "dbb80209a669529b17553d152d5b3ccffbabd5c44b1e6a7e63a2d011e5425a2c"; } - { locale = "be"; arch = "linux-i686"; sha256 = "358cf7d9b9b13cbd5614daa4f140a412e777f2dffe0dfa2673b33582f59e02f9"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "bd4ac7afafcc4b4a65e34f207f7c07b24be36c06c8e067fb75f4a22ce759fb4b"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "853629b5625f9dd9a81d5f18d862f0f527043435a7c4624f6f78fa68541a5bba"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "8d094f3d934d2ca42c38b985145bec7f72b4ddb9af7c31e30413721eaecc934d"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d569e6211c4c011955553f3480fd8530ba6dd853b227859f95b0d8af4d9e8c6e"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "5ed4e24f7725864b47dcbb0602463bc95bb33c8e4413483854e0bf3f33ad9376"; } - { locale = "br"; arch = "linux-i686"; sha256 = "683716f591654dfc843a32198d5bbf6199bccb1a035d391293c4877f0ec47b1c"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "965d58b4ea4280f20d197e28e0e9eb87b29fc955e4f6e15b6582027000d0da6f"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "eadc1248c9352574dcfcdcb3264a662d3a29f85a2f112f77a843f76d8778cba2"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "cdd631c4a32d529a85f04bee01bbc7f50396b183a0f154808e801d29f0f11aab"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "093f01ad325ba33f3f33f2efd72fb5cf3a87dd81162b094dc544744af78f3705"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "f74b39dfd0d9f2241ea65d55a6e9459296796adf228def80c57dd66c3f05921d"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "f84113f32952ae91a35d2aa166f16c4683e03fa43ce6fbd911d0f7f237b22ee8"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e53fd624a5c968e60cd485ea7c7b80a68c164c2f165287ec68a180066c560cb"; } - { locale = "da"; arch = "linux-i686"; sha256 = "ff1f79558185d2a29487d15f95140716603f5978e8fcd891206ea0c5697342a0"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "522c53748cc7ab0faab84e124e45f3bcdb865f4b5312ff129fc50700ebc4d8ef"; } - { locale = "de"; arch = "linux-i686"; sha256 = "3e83bca492c325438f48880d76a259c3fbfa65eac71569a79e1fdff858268621"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "020655df7c19750f86a7e1778846ed53e2fe350d44a76f4ac0acaeb82c9d4100"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "3409d2988bb31b2dfc490e03976471e2d09139660a4c08daab518f3095b45170"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "f5d084e8efe87488fed491432d93fb74c7e14b1fbcbc2abf21af6c669110b5bf"; } - { locale = "el"; arch = "linux-i686"; sha256 = "514a3262c1d0e146b3dbfc24d54b73ce0a5e27e02f26692e25ba6e36897da125"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "924b0e1514cddbad893446bb6561ca9422d46f6f5303fa7f847550f2f92a988f"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "1cff7f847a1ca8a52cfc9a733b7e223a8468a82f5ea9c7d8e1c074868a9baf27"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "5e803270db14ba348ab7b8697d488d172b774a8d782c22f079db0e8ccda793bf"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "95428cacb129137747da7cab4c793f102f87a5224ad2a5adc6f52939df746432"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "828317d27c4336aebf7122e2e5268697d8d0cdcde9bf874b63798f7fc6f84fd1"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "7ec8555eeb01f126671b89fd8dcc46f219bc938cf15ca8b7f67b13a1df38a101"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "082c9ace7d6775aff0e0b379206fa5109ce5bac08686ab937b7441edd6e17d6f"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "722e87bb5dbde3a7aa6ce5a913622a050a3fd1da822656a787cac6a18881737f"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "4420c5d0b773e76bdfa4e4ac842b86f3875ad81dc5b4d0666497a30d77267720"; } - { locale = "et"; arch = "linux-i686"; sha256 = "a3128b1315428ec2906ff44bef49f8f448d7116bae80be7bd68bf78138cf5192"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "299284d934129a15b70ca9f2d26fb05773d555972b14afe9f65826aaeda7bbf6"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "197ba5387010a6d95fff049d780829526d1676de43f1eaa16be2ae1f04f1601a"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "fc8386c294d107994463311d3778ad507a8848af3be8a533fd2c5be7394b9222"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "db764598fb0cec2fdd0e585b3396e53fa873af303c4f9a027061a0179e445705"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "ea87a217ec9934fae484a32f4dcc655cac04116c9b0c73e458eaee7e595f2b77"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "e27563fdfcfceb5ed4b2643d63d5c26834ca9afed1d887151671fd13086fd66a"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "0ee8fdb3d0a1e50afa5f232fba57d84b97c428c41176e73a712a2438bc3e8796"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "a5a785c9ebfb40a7962e29603792de280c57ff5d77f7836c5048074d5c9d4178"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c5bbbb471fc2af310d768e7b01ff1336f78791a42a60b4473cdab00c0bd6e980"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9c18f2677315f8613203dc69a7877b83e787f6c0b96fb150ab7e4ba3ac712e54"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "ccfcca939876bcca2e3b9fd81aee747d1c94f0df02f5258c9ae43564f61c7c23"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "60031f3767779568e49ea477fd2677adf0f437d5663a53b7d96203e2cbc85f1e"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "1090d5993cfffa923be8a8bb3acb197bd7968c994a1558a1024d81283e9341b2"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "5a67627f06ae51553730e9185a11208f6ba15c421ebc5fa3ba358a341830efae"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "2f7d114cfd69859f1cecd479ad00735744efe19b8a3db1be391fcd7dfe6ca757"; } - { locale = "he"; arch = "linux-i686"; sha256 = "f6cd331db9669ec8d910210061e95f2c87e64afe6343f5faaf75a321a5b99471"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "f665b75ad6ad846c57007e747931b89d773984beedb825c87fcb07a86ab52f9b"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "69b5baa57f47ce77373aa9505b2ccba0baf90911f2c3ebaef28b043b601ad34b"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "7bd6d9e36e87cf2e3aadb4fc7dec2dea371004466bc9a84ead3f60a59af38ae8"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "72cd9a12387bc5dc02783bb6f6a1d55ab8444557e4d2c46c35b93ce0ab0cf394"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "27b60e8cee363317070e74702d9ba97e5d68318caba0e17fc37aad6bf0fbb362"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "b0b8219da55e81f3feb0872333eadd0f490b251fae09244d31287f2e40339861"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "fb1b52b27253280f98e01b11e6f46e01d854998831b337a52922b925570ca330"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8474bc4a1fd0f8b27131ed3ba999402e1a56b7e04be157e571b95c470f43e779"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e68036c3057ce7c369b43335397c8248e5aac83a6db6e729c8e1116ed57a20a1"; } - { locale = "id"; arch = "linux-i686"; sha256 = "23ea1fb9c64baf835be0a87f7633ee5b87cc05db90a652ca05f17d6b2cb1904c"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "52584ff6ec72359f44891e630b099fc9114e1266a11cd0d063db5ff6034ed02e"; } - { locale = "is"; arch = "linux-i686"; sha256 = "3e018dd9407823747dce9d32571a390a8fdff11339826bcd68c6879b8edb9c1b"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "f86a8cd6be21403749607690c467baa126be38e547d1b0e3f50d40477b346fde"; } - { locale = "it"; arch = "linux-i686"; sha256 = "82afb08b29d44aa09da71c454c42d31fbf7ee2756c6f1ddca5c456179e5a7f89"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "d449b869faf6438697bb7e3f692c9bca6c1a116441b08dbd84e775de62564470"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "02bcacb390dd85bf2e7809751d840fa7c87bb8eac467d9bc2cb50a77559060f9"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "8ee832167990dc9546775a1c32518e4524b0f92147ce11e149b0b447932f7ecc"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "374b797f6d662e3deb5a05f6939f650a0ec272f7788cc7dc1a02fc0262e5c903"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "e0308132773119f13443ab475d66e651182adf508b7ca04b0efb65fd84013916"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "dce54478d896490141be7f10ef780196ce446e3312cf5623315baedc4354f992"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "e4b478609faa58ab0e8de7e2f542290f9ecf268d68f32828182208337523d3f5"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "14b2df6e331ae651d1d913c2d7116466df63e9fd24aad02db7a7f3dd010820c4"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "779f48e75546babae4ee153ce7d16f93af9daabf70f855dd702281e948a75cba"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "faa6893cff053c090428035964fe67af8ecf9f5b71225678754e96d38d498311"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "8a3ddebc51e182175afc272f16bdb7a584d78dd7af8849844f4e02892a439efd"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "3298284a9b326eccc05343ec5795034fa46dbfe75458e19d39d23564391840ac"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "e1f2da61eaf58f723e0c0021eb728e2a78a8cf36db60353e58d0233c2de60f73"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4cb1c3b16b8d70f19e14a185bfbbc505d66795ddc4d55e1575193dd018c950d6"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "72b2c72ee5da9c4b353868efc0431b78feaeb0be8c18eecab6df4cfa0c5c7a3c"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "48e7d195e4b6b9144e32f4a254a40f10c59a167a05ce0f38a013f4b914511d55"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "ac6b2064b76b2a5f3cfad6089897126bca7cbf64922b61474eb01b0d65638221"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "57aee02d52b638d393df6a824021a1355df83711dc50663cc67a71366004a017"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "451de8f95bc2eaf67d1abb7ec604f566e5cb2f6b9a8ae2f2495f10a7157a12eb"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "98391cba2a9cfd194cb427243738e588f6de9c112762a6c1e099ba7a4fe621a0"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "92eeb485a7da11f1d600371d596c31fff778415784b54ec2fc5ba74199f49ec5"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "f4e3073d31b221dc2fb37162011d6ab9c0980137cd81f0d9bf70384cfda91e4a"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "4694fd61f7fe2a1066e08f85f041112076d63cf0fcb99db79c5833d714684388"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "088c29a337c926dcbe11ef19c072624014ae7b59cf0ba2a0b8f25a5a725ec796"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "0cb7c16955538ce7089e3aa8e5bc5c3325c4867aadf56837e7e3a05e86c4f482"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "b420443eec07c56afed8435c02c305d355935cb0131b672814878cc9fb0143e6"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "5964971c7261ba0619d34ce70d1fcf00aa105f159e2e47853d67fe03579dcbb7"; } - { locale = "si"; arch = "linux-i686"; sha256 = "ffb21e8a7a02ec8ef445735bc519671f3f3bf90f994db750a4d29385d574fd24"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "1177e20ff9b866c4c7e49a929c1f54c47174f80a8541ad0c98d5e472c4f20d26"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "1309eaf342d7bd7a31c1022183e13e1b02275b01228fbfbd0d5e8b3ef235cceb"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "adf736651eab43de2a927cd7ad471042f35eada0a5df4a09c0bbccf75dd17b44"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "102c828dd42872ca9472d94ff842f412bd907be1f4cec8605805fea9f75250e2"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "ebb608409f3c4ab44a6818020a826be7c3402977c18b08200df6b332e0a7fd3c"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "ff984951130343fdba5377f91e325e7cd21b7c4e25a524b4a1bc98978842e45c"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "15ca7d36207f8e7a80744d0d15966015c8dc395464cf7f70c98b643059f19fcb"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "6c93f80d249ab5558543cc7b13cf72c2abba1da0616a817661f790e5c17c24cd"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "3c6c64fbc264d4a3c98ae69c92ea778a87bd84ea23ded7f63117b4c77f93b4d5"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "3a82d99b249d9a99d207fc0b1d5a1bd8523833dc61ec09dd917ff427659ec338"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0bf0e9ff45b3d25ef1b31f28b91e30280e8bdb25f864a31ccac795f66e27bb68"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "d346b57092959dbc880c9dc5a8b832dc7967c171ac361aa9b7e77b5589bd4c9e"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "6d86d75981ba1850980c3fa498c804dc64b4328c90d12d3a5c13af2f1e47af6d"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "179a67fbb2420615e179d1c69cc5dccf1b135a7c61aea26bda658c724655931f"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "bc95ac4b30ae806658218df21f5d9aa6c26b8b8c5fc8a58090de92e347735c58"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "8b49fbe88dcc328b94a99f3b30af9f783910dbcdea1fc5b160526409d56994f7"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "2ab49ec5742c07c44028d8aa980a6bd96623c554699037fd64d28cf4744789ce"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "6eecd8d5fa6d6a826fec7a09ba11092348a0fa74c7c7a8c1239f41392d2e2055"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "fdb2a25480eee0659803432fea02794f73aa18e9fe5a4b1c1c70ac5aceb09b4f"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "64358161ecc5064ee9fd26e301136a58f32b387466d6127604772b59b44f32c5"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f9f54927e4ee378f56879b6ffc121d02ad300f6982d7751e730564ed9a9d8c80"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "78a6721da743bec597c9dd1e6bededffa43d675784f3585b0d1f03989007f295"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "fc3460aae0c3395220644ec0ce8c139512726e62d591ef51f4900ac3c9a9e461"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "1edc09feab9b25f333f192c07b33e0f4b3ee093145d32f4eca4e93003a396ce4"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "0681fca92f04ae1c4b3a306756f050f128b0534ee93ca6bc7fa0b5d5272a3bf3"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "f16600e6cfa49a99c6a827231e1411fefb6a0c83f9cfc44e862b3a97f7c778fc"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "9c37be63be7dc3f338af3326d5917592096b94df2423d1dc81daea4e31cd8658"; } + { locale = "be"; arch = "linux-i686"; sha256 = "1779ec20a630b02543f51eb735f33e1b920061e328a8c0966209096f47051a18"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "826d926a96ec9e8d5b46ed4649ac67ebe1a67db1eb746ee5e37b1fdf0f09ddb0"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "aa6d3070ffebb5fe9f9205cab6c6bb3b57033e5d6acbafc45ca3fc89fa35f849"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "e21460bf056e8b1fe683a11b688307580a13b51db03ffb235dc32c6e50ce8ac7"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "77d6dd2686b8bd5962c70a8ea09c10cbc0f60a0c7effdf00ac346bca9b6af313"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "a417f6bcd228afa2be0c71206af9f06841a8dc29950a8975e6455af215911e1f"; } + { locale = "br"; arch = "linux-i686"; sha256 = "920c81326f5f33e1e1a3a4229d0544360aa9f7bbe5eb32db3ea30dc34764e515"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "be967c23e45a06532dd8a2611a31bc842ff79c6da6b63444bd9f6a3db7f834a2"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "98d88b01ed35dbbaf5b06418a26018c86d6b07f9ce9fe999b007ce6844e3832c"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "616a724f6a0a1493c321a83c274895ba7234977f2d7ab264d44dda39d34dddaf"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "ebebf6d26d900103851e1f8ccc5cb26506902a996a5c92674f165c79ad090fde"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "43b1a4ad27868b968112c86893465d8c765d383a9653b64dc27609644b7c4bfc"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "52b7a40c87adac16d77e9a03827c0db49286f1576ead85c6a5bff3b8ab33d546"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "2c413971b22bafac67729e6f5967513f4dabbff441cad4aecaa3fa363aed807a"; } + { locale = "da"; arch = "linux-i686"; sha256 = "aab8b9b66d9b80c94ff9b26102cec7cb9ff9c7dc859f4606bba8d48d47ebebf4"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "24daf3a574619b2be424b4f5bbda732b500bd6ea5eff6e3b858dfe4bb0b2cfa1"; } + { locale = "de"; arch = "linux-i686"; sha256 = "385860c48089394ba0bd939cc60506c62f9d4b54903ee3c0e04006e6af619408"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "e0e61f60915f7562151e47e3458830aa1323519ce76cbd9638559ec177da1093"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "e2a19f5fc03bb3ea1a97ed501540b42fea923033592b0790aa4bcd93ff619421"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "95fa2341481aa869ef1d417c617ccbe54cc0f57ac0b4cb7266c6399887e1f04a"; } + { locale = "el"; arch = "linux-i686"; sha256 = "3dc35863b9aea5cfdb28ecd71ad798eee711c859d27acb46fb2294861ba713d7"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "546a4cf57c52ef054c2c58b9792b5b8ed0933368d8f4343f78604328c4117d42"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "74194c95fba578feec4ac92569be45a9b948a4ae403d62bce5e11f5047ebbf11"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9da80fa8d1c96e08c2338c77c67548e4a16e151c8ebddfb28da779f1bfeabefe"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "c4e1d0a902ab04db666ac90cf1003f8b48ed88e3291fbbf1d6b2606e805a45b0"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "843ce88b796c4705c61ab5a68a215fc82c2ee32e655c2c4d0dd244e97ae0705d"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "4fe05cbcf9b1d5aee936c29f19675c1d9658630cfe0c68570244ac57a5e8612e"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0c3b83406c1b38249e52e0c8f17389e9861cfd5578a15a66c9bad89784d21b31"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "937a41e69189e50ac893d06abcd5ab032281f0531a2cb5acbd60bfdd4fff6a75"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3d58ed89c2dd316fdbcf218666ca837b5200dc35462a89f41e8a83c4eb7620fa"; } + { locale = "et"; arch = "linux-i686"; sha256 = "46e211a049ca3e3e986db7620b087a4ec41b73b1f4051aece68881c73b342bf7"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "69c968a92241703e4cc71e905b35a74e4326f6b8e32cad84dbeb3ea1b802c7a1"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "dc638be813979a640e12f1fc4bed727ce639bc8d50b1b1d084e8733a067155ef"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "26362027c5e5b3d69ebaecbed10c300d232dd3ccdbf96e113f720518584f5c03"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "947481357bacb8a91b0a49956007e8ffaf0575815d5dcff0750f4cb2890f9e22"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "35716446800a69a71aaf6f91e8bab850f8f681e6acaa6f36429f71a2bdd0e04a"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "27aeb7724e1d76d1d81bf583b94580d3745177b1983b63e4dd88ec6ae204ba13"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "482aba9f35f2026e4b9dfb009f45925f87a71a21c9338fd27a52ca1113d9759e"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "7adb9045525b10914173092731ed3a4194e68b3b3661a83b008e8cb651518b0c"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "4177e0f51a0877633cde98bc0d81a8f6391c6a87932546dfc094deea30ea5190"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "c77fd8481fe999f3e0b63952137762947c58a397be82027755bbe2aa8bee9c8a"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39c2da28763cccabf86c6713bc62862edd37605c117d9c197cdeaabbb1cab31d"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "2be49f3b06a46ed89687de23459c42052b7a50814d32127121007c620fc56f8a"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "e0f9d78a12263fe8b8d40332bcc52a7c8db374c655564394e4ed850cf4567593"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "2f66892cf58b1aa63a748b9be966fbd07077a369a46ee4e4d241be37abfe083d"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "235b01ed0a702de629a61ee0a69ff4564fe479782d85c95a69fc121e5bf96df1"; } + { locale = "he"; arch = "linux-i686"; sha256 = "5a3486d56950a6b14dcacf8cb40a55a7d2024c2838c52f77acc745fcbba6863e"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "fae68a673712cb7929baf4e54358c851846901d519359ab53b270cfd215ecc5c"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "e2044cda9fd387af1368115a47e56c5a81d2f9fbf9135dc7b5441b88ac5bda1d"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "7205a8f3b20a5a1a7af08860a99d2be2d4ec78873f7e0cb579040285c3ef85f8"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "a2357944e25f3d1434d33cade62d079b0dee878c8f6d1aa2d3cae94500dce14a"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3bb4658ecd2bce8d2204859cf95f8a85f90c6eb6f15e44ac50c1824aaa884da3"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "31da7a7cde19de47455b6cd855ed0e77efaa30e76989a26df71bce73134e384e"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "4703c48e899d36eb8d6aeb0f1d0101bf39f12c921716b7aaf041068b42046dfb"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bec4ef424007894fe85a06cf8af03da2bc48c7d68e6ecde3287a6863408e6392"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "028bd4d92f502c4b4b0af52f5d992abfdf4d988974d8b991194284aa5ccb25b3"; } + { locale = "id"; arch = "linux-i686"; sha256 = "5718068cd54ecb06e0ce7a4ddc87b923b76d7341a989a946717e2b34b1b49a0e"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "112928c75789795e21050b8202d49b50fdb3b10f21c3d2c140e9cbd7ba96bafe"; } + { locale = "is"; arch = "linux-i686"; sha256 = "4bd5abdb8fb9c389601b9e6c8fcd18e53e8c24097ee338199ee12b03f580faff"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "e4ee538f072398ae16c70ebcd32e06129b2d94a88104710a2b165af1b1da8541"; } + { locale = "it"; arch = "linux-i686"; sha256 = "2269ea4101db9f9bb961d79fa30ecece49178a747cb10fb5f90f09d14dcbacd6"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "04cef93ee74ff13d6ddc9cfe60440d128bc8b432be62d988094d73461138cff1"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "762e6c0879c0983dc059f3b4550681d947b0ceb2dd82331a587463d881c7fb65"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "90748465b87b0bffcf70e7c6d83d2f6ce7873b751a5c1dc2d63d18cc60a8c25a"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "ce867efb9452465ae1f6ab0eebbe06721c3987614b42c901a12e43ce3e5a6ad5"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "9aab21893818eb86a7da148650873c4e6e1faa047d35e1ff6845001d4eabb2d4"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "3f8fec266c7e612183ea1d60e44f90c8f5c713b2af0038ca10fef9964662c0a9"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "f7efb6a495e57439c287ed8cdeacbdff6980ff89493497ab384a3c3c33fccaea"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "02b0002e52a7e1c91a4f200ece1c9e1b133b7d50688e483c041cdf57ef7d8a06"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "d4d6f125a9af64ad1967e414cb4f5d7a4cdc636c805f9790bf1c79573900aeef"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "16b9e1d15b64b7d44ba3f2e39aa5a772a6d26ec347170b86c6455f4591bae22b"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "0d8b130e681ca5a2ebd7b2f032b5779eb148540d7802097df8430f6cf095a5f8"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "37d08bbf72c34ee677dd0fe39016f75a13e5e078ce23236b742a0de2131421dd"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "c76e50a850ef98f07e030564fa8ec7411ca31aa128e8b6393227e40c91b47938"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "3aef7a6aef6d05c17f757603c81f2f550c0681b3f3ae38abd02d8224c10754c0"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b5434c9a814f6ece725ef1bf7f47381fe7b56e2c1c05832a75e95152b8706725"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "215845fbfd3e76c73861b59324df380b794413b25efd1189975589bc843b9d28"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "0f07a3c7f6518dbe056814e0ab257036ffabd3770bebdf2ccd053eaee499654c"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "28f668d318a441cd57c9e85dda1de98502a545933b7af2a3d2aef066952a3eb9"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "eae9dee3c5677e40ec3ce0c6594937671ae07be49b8488abbe94d1ba52bd3f16"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "36d9ae4720d5e673c02e2fe850f3e66786b853f1e5e81368e3e62715b612cc57"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bb5156054e96d515bac61cf942560d73166c27f052abf05344d81544b3d09938"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "79322d60677bfeb493f0ebc64d336201ff75f34af6131a8fda742518c45c7cc0"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "7544877e762913619dda73a3ebbc48d81aa2519a014284b79d7fdb65de678f20"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "d1ab21feb037542faf032668ba6875157775f5efa95b3c1a8a31cc0fc8ea0a40"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "8f2ef95bd7d82086dd8369e2ec144348d085527cab8e89b33d938c93103c4e15"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "99390a8350cdf26c69203670458fbc7b6700797a55fa37f498148dca0fbca7b7"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "6a52e3d8db23fd0c1e091f1b90dc80603cd8ce345d488228f3b595f1b707bb60"; } + { locale = "si"; arch = "linux-i686"; sha256 = "15e8ca12df3192e174f2787aca1d4a5b992ca2f45525a5d2f06683b2e8864bd3"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "6b7d66bbe8cb6ed0c4a1f44a3885d5c7e4a5db79a1db98530a099e6bb7a417bc"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "4ce5be3d7455c72ec7c6ecb56824220ab74712b1c4ee27212010cb8e12959edb"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "1a3911a18156a2dce9417c84bff20b7f41b8e5f5e2a578ffe33b26db0b4bcb30"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "a43200e303054b34c4e4e7c81f561a8c1d33c122af61e23b89b3a8cb8c0d26d5"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "f7e456499b7acf5e8eae4d04abcf43210f00bab8b4b7f42e047f2ee13473f3f6"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "9a444b55077da2817c72538c72f53e6ff945e4f88ba6c222e2676de21bae2435"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "96eb242e79a7155fe85dcd7eb1b1606f9d84c72aebffed2244cb149d7d77740f"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "79c98c7d34b327b596f0a3e417508d5bbe77fd61b761995635559cc5f88d85e7"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "0041421d294f06d993dd4184b66f6fa6c58244b231a64da1b20dd76b5becb4b4"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a17ab2cc74b4c9367c21a176eb1cd83fce74bea24996b4987644659f9ef0bc68"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0fd181a6d7425db8f0077175b8905f3a646af081a9db1a2b635f8c95c99e01b2"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "34eca4b0d4d808b280045381def6976106e3e78c43d901bc512b9aea83537876"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "4633828b594d330c252b5e4931e85f98797ec2aa17400e546dea7a4099bfe543"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "b8584087e44d967ec5badeee5d9ac86653709f858e65b4356e0fa8d3ea5e3369"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "dda18542ba3f27cf0b2a1499121c43dc5c085ada40cd825dad119135a1fd4385"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "5cb1e2fdbf857f93851ee1b1aa3ad00c538def17641f14742b446414706f74c1"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "84dc247e8a46f0ff1b5bd7f25956e0988edab18e72649b7d4c264b6160a47de2"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "a38fde2cbdb45552950db906b19eed3135e930da8242791811683bb2fb850fb4"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "5eff491a6d6ec1b54788beb300f61fbd98be72037a769054967af7a062afec61"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "c4644e65f6d1a1cb710806026814c416268453b571531e87d71800deb3625128"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "dd8d802b34d76ccdeb569b86aec75f27d29c23b6c74ce6d5bfb0a5239ee581af"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "1a9e7322512caa10247f58674fbbf55d5a624ef36a9d570d8ebdb6e1c5c6889a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "a84310a24bfe845e9c3992fe5441e9cbc049054fdc53f659dbea997ae17e937f"; } ]; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 12c250ab28bbe..646e3dfdd0bbd 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -40,7 +40,9 @@ let ++ (overrides.configureFlags or [ ]); configurePhase = '' + runHook preConfigure qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib" + runHook postConfigure ''; makeFlags = [ "release" ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 6c061940b26d2..0815254755500 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram "$f" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 855ebdd059365..020d001705310 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; patchPhase = '' # Fix build error diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a139531b19a63..e7fe79d66a564 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2"; patchPhase = '' sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 3ff12c274d539..cc8e5dc4de081 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre, - openssl, ncurses, glib, gtk, atk, pango, flex, bison }: + openssl, ncurses, glib, gtk2, atk, pango, flex, bison }: stdenv.mkDerivation rec { name = "ettercap-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libpcap libnet zlib curl pcre openssl ncurses - glib gtk atk pango flex bison + glib gtk2 atk pango flex bison ]; preConfigure = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 525e154702320..23c226b9f8a54 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -16,7 +16,7 @@ let else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a" else throw "Spideroak client for: ${stdenv.system} not supported!"; - ldpath = stdenv.lib.makeSearchPath "lib" [ + ldpath = stdenv.lib.makeLibraryPath [ glib fontconfig libXext libX11 freetype libXrender ]; @@ -41,7 +41,7 @@ in stdenv.mkDerivation { mkdir "$out/bin" rm "$out/usr/bin/SpiderOakONE" - patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ + patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" RPATH=$out/opt/SpiderOakONE/lib:${ldpath} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 040b489303249..450c15bb65e3a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas -, defaultIconTheme, glib +, defaultIconTheme, glib, ncurses , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true , kdeIntegration ? false @@ -23,8 +23,8 @@ let langsSpaces = lib.concatStringsSep " " langs; major = "5"; minor = "1"; - patch = "0"; - tweak = "3"; + patch = "2"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -50,14 +50,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px"; + sha256 = "1w2m4hfrxb706p8bjfgklqv0j5hnivbvif3vav7sbngp5ms0vgvz"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2"; + sha256 = "0lr90z5fdg157lcid5w4p0zxi72c4xziiw51kh38kbbqrbb9ykfw"; }; }; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl"; + sha256 = "108p8jg22lg3g9wypqv5d71j4vkcpmg2x2w9l2v4z9h10agdrv2l"; }; # Openoffice will open libcups dynamically, so we link it directly @@ -240,7 +240,7 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends tcsh unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz - librevenge libe-book libmwaw glm glew + librevenge libe-book libmwaw glm glew ncurses libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper ] ++ lib.optional kdeIntegration kde4.kdelibs; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 21a16a5fc69ed..7af49d51a85e3 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -190,8 +190,8 @@ brief = false; } { - name = "graphite2-minimal-1.3.4.tgz"; - md5 = "5c0c9ac0996fbb4a0e17780ff5441959"; + name = "graphite-minimal-1.3.6.tgz"; + md5 = "17df8301bcc459e83f8a8f3aca6183b2"; brief = false; } { @@ -285,8 +285,8 @@ brief = true; } { - name = "language-subtag-registry-2015-08-04.tar.bz2"; - md5 = "bf5986dbfa1c9a0f26cf1b00ed369484"; + name = "language-subtag-registry-2016-02-10.tar.bz2"; + md5 = "d1e7c55a0383f7d720d3ead0b6117284"; brief = true; } { @@ -376,13 +376,13 @@ brief = false; } { - name = "neon-0.29.5.tar.gz"; - md5 = "ff369e69ef0f0143beb5626164e87ae2"; + name = "neon-0.30.1.tar.gz"; + md5 = "231adebe5c2f78fded3e3df6e958878e"; brief = false; } { - name = "nss-3.19.4-with-nspr-4.10.10.tar.gz"; - md5 = "478e0e90ebc4a90159549e77021021fd"; + name = "nss-3.22.2-with-nspr-4.12.tar.gz"; + md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; brief = false; } { @@ -401,8 +401,8 @@ brief = false; } { - name = "openssl-1.0.2a.tar.gz"; - md5 = "a06c547dac9044161a477211049f60ef"; + name = "openssl-1.0.2g.tar.gz"; + md5 = "f3c710c045cdee5fd114feb69feba7aa"; brief = true; } { diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 86b0ffbcf24c3..f2407e1a8333f 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { CPPFLAGS = "-DNDEBUG"; CFLAGS = "-O2 -fsigned-char"; CXXFLAGS = "-O2 -fsigned-char"; - GTK_CFLAGS = "-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; + GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; installPhase = ''make MKDIR_P="mkdir -p" install''; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix new file mode 100644 index 0000000000000..7c85513bd8e90 --- /dev/null +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib, ncurses }: + +stdenv.mkDerivation rec { + name = "samtools-${version}"; + version = "1.3"; + + src = fetchurl { + url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; + sha256 = "03mnf0mhbfwhqlqfslrhfnw68s3g0fs1as354i9a584mqw1l1smy"; + }; + + buildInputs = [ zlib ncurses ]; + + meta = with stdenv.lib; { + description = "Tools (written in C using htslib) for manipulating next-generation sequencing data"; + license = licenses.mit; + homepage = http://www.htslib.org/; + }; +} diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 302c6a318e656..ff0502ac0cbb1 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg boost ]; configurePhase = '' + runHook preConfigure cd fritzing-${version}.source echo $PATH qmake PREFIX=$out phoenix.pro + runHook postConfigure ''; meta = { diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index e9849d0460c8a..c62ecdcd1e2a4 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }: let - libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include"; - libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib"; + libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; + libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { name = "tkgate-1.8.7"; diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index 104fb02fc4504..1485626125d27 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -6,7 +6,7 @@ {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5"; + version = "8.5pl1"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz; - sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9"; + url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + sha256 = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index f8a57aebb6dcb..c7fb4ffbb978a 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir chroot-fontconfig - cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf + cat ${fontconfig.out}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf echo "</fontconfig>" >> chroot-fontconfig/fonts.conf diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix new file mode 100644 index 0000000000000..c8493b5946900 --- /dev/null +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, + python27, python27Packages}: + +stdenv.mkDerivation rec { + version = "201409.1"; + build_nr = "13892"; + name = "mcrl2-${version}"; + + src = fetchurl { + url = "http://www.mcrl2.org/download/devel/mcrl2-${version}.${build_nr}.tar.gz"; + sha256 = "0cknpind6rma12q93rbm638ijhy8sj8nd20wnw8l0f651wm0x036"; + }; + + buildInputs = [ xlibs.libX11 cmake subversion mesa qt5.qtbase boost + python27 python27Packages.pyyaml python27Packages.psutil ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A toolset for model-checking concurrent systems and protocols"; + longDescription = '' + A formal specification language with an associated toolset, + that can be used for modelling, validation and verification of + concurrent systems and protocols + ''; + homepage = http://www.mcrl2.org/; + license = licenses.boost; + maintainers = with maintainers; [ moretea ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index eebe6ff0a06c8..1153c0b3cf5c0 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mv doc $out/share # Hack around lack of libtinfo in NixOS - ln -s ${ncurses}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5 + ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5 ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 # Add a clang symlink for easy building with a suitable compiler. diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5daaa444c1272..f495ee257ff05 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, gperf, autoreconfHook }: +{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook }: stdenv.mkDerivation rec { name = "yices-${version}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs"; }; - configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a" - "--with-static-gmp-include-dir=${gmp}/include" + configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" + "--with-static-gmp-include-dir=${gmp-static.dev}/include" ]; - buildInputs = [ gmp gperf autoreconfHook ]; + buildInputs = [ gmp-static gperf autoreconfHook ]; meta = { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 067cb1341140d..5ff510a52ce8d 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -73,8 +73,8 @@ let for p in $out/bin/*; do wrapProgram $p \ - --suffix LD_LIBRARY_PATH ';' "${lib.makeSearchPath "lib" runtimeDeps_}" \ - --suffix PATH ';' "${lib.makeSearchPath "bin" runtimeDeps_}" \ + --suffix LD_LIBRARY_PATH ';' "${lib.makeLibraryPath runtimeDeps_}" \ + --suffix PATH ';' "${lib.makeBinPath runtimeDeps_}" \ --suffix LUA_PATH ';' "\"$LUA_PATH\"" \ --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \ --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index e7a195659491b..2ca2cab3afd8c 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { CXX=$(type -p g++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" - LDFLAGS="-L${gfortran.cc}/lib" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 7573b8955b19d..2a43cf5677fea 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 05c6f26229346..c2988331c4cde 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index e42bd0f83ee07..4497356a29f81 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -5,7 +5,7 @@ let version = "5.36.1"; searchPath = - stdenv.lib.makeSearchPath "bin" + stdenv.lib.makeBinPath (stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]); in stdenv.mkDerivation { diff --git a/pkgs/applications/science/misc/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch deleted file mode 100644 index 6d2d4cdc70d86..0000000000000 --- a/pkgs/applications/science/misc/root/cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 -+++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 -@@ -149,7 +149,7 @@ - - #---General Build options---------------------------------------------------------------------- - # use, i.e. don't skip the full RPATH for the build tree --set(CMAKE_SKIP_BUILD_RPATH FALSE) -+set(CMAKE_SKIP_BUILD_RPATH TRUE) - # when building, don't use the install RPATH already (but later on when installing) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - # add the automatically determined parts of the RPATH diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index e61cb557e1233..9795604bab145 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,31 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran -, libX11,libXpm, libXft, libXext, zlib }: +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python +, libX11, libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "5.34.15"; + version = "6.04.16"; src = fetchurl { - url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz"; - sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i"; + url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; + sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm"; }; - buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ]; + buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib ]; - NIX_CFLAGS_LINK = "-lX11"; - - # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in - # <rootsrc>/cmake/modules/RootBuildOptions.cmake. - # This patch sets it to TRUE. - patches = [ - ./cmake.patch - (fetchpatch { - name = "fix-tm_t-member.diff"; - url = "https://github.com/root-mirror/root/commit/" - + "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff"; - sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907"; - }) - ]; + cmakeFlags = "-Drpath=ON"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 47a6ee44952bd..692be0a88b122 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -28,19 +28,11 @@ stdenv.mkDerivation rec { patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; - preConfigure = '' - git submodule init - git submodule update - - ''; - configurePhase = '' + runHook preConfigure mkdir build - pushd build - - qmake ../qgroundcontrol.pro - - popd + (cd build && qmake ../qgroundcontrol.pro) + runHook postConfigure ''; preBuild = "pushd build/"; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c396870f9e5b1..253b97aff1e70 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -29,20 +29,20 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace antiword ${antiword}/bin/antiword substituteInPlace $f --replace awk ${gawk}/bin/awk substituteInPlace $f --replace catppt ${catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused - substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt + substituteInPlace $f --replace djvused ${djvulibre.bin}/bin/djvused + substituteInPlace $f --replace djvutxt ${djvulibre.bin}/bin/djvutxt substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep substituteInPlace $f --replace groff ${groff}/bin/groff substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${libiconv}/bin/iconv + substituteInPlace $f --replace iconv ${libiconv.bin or libiconv}/bin/iconv substituteInPlace $f --replace lyx ${lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${poppler_utils}/bin/pdftotext + substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii substituteInPlace $f --replace sed ${gnused}/bin/sed substituteInPlace $f --replace tar ${gnutar}/bin/tar substituteInPlace $f --replace unzip ${unzip}/bin/unzip substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc + substituteInPlace $f --replace xsltproc ${libxslt.bin}/bin/xsltproc substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf substituteInPlace $f --replace untex ${untex}/bin/untex substituteInPlace $f --replace wpd2html ${libwpd}/bin/wpd2html diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 62a58ee985c0a..eae18c39dadd9 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { postInstall = let - binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ]; + binpath = makeBinPath [ out rcs cvs git coreutils rsync ]; in '' for prog in cvs-fast-export cvsconvert cvssync; do wrapProgram $out/bin/$prog \ diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 870248ed75d25..85749f978d1c9 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { python ./setup.py install --prefix=$out for i in bzr svn git; do wrapProgram $out/bin/cvs2$i \ - --prefix PATH : "${lib.makeSearchPath "bin" [ cvs ]}" \ + --prefix PATH : "${lib.makeBinPath [ cvs ]}" \ --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" done ''; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 49e1734fe02d0..d144d484ed394 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ - -e 's|"xz"|"${xz}/bin/xz"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"xz"|"${xz.bin}/bin/xz"|' \ -i ui-snapshot.c ''; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index 91fe1662efec8..f282fa6635b81 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i 's|/bin/cat|cat|' ./src/repository.cpp qmake - make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""' + make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion.dev}/include/subversion-1 -DVER="\"${src.rev}\""' ''; installPhase = '' diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index b99727b2c9b61..f44baad4715b0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,7 +3,7 @@ , ApplicationServices, cf-private }: let - version = "3.7.1"; + version = "3.7.3"; name = "mercurial-${version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1vfgqlb8z2k1vcx2nvcianxmml79cqqqncchw6aj40sa8hgpvlwn"; + sha256 = "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 58b29c10ae368..0f2f7646ac6af 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini - sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py + sed -ie 's|/usr/bin/svnadmin|${subversion.out}/bin/svnadmin|' ./rabbitvcs/ui/create.py sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py ''; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 843fe9ad3230d..9397aa8a1e19c 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { buildInputs = [ wxGTK subversion apr aprutil python ]; - configureFlags = [ "--with-svn-include=${subversion}/include" - "--with-svn-lib=${subversion}/lib" ]; + configureFlags = [ "--with-svn-include=${subversion.dev}/include" + "--with-svn-lib=${subversion.out}/lib" ]; meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix index 5971f2e9cddcc..82643f18a554b 100644 --- a/pkgs/applications/version-management/redmine/bootstrap.nix +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { bundle config --local build.nokogiri --use-system-libraries \ --with-iconv-dir=${libiconv} \ - --with-xslt-dir=${libxslt} \ - --with-xml2-dir=${libxml2} \ + --with-xslt-dir=${libxslt.out} \ + --with-xml2-dir=${libxml2.out} \ --with-pkg-config \ --with-pg-config=${postgresql}/bin/pg_config diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 5c2dde9557213..669151adbcc8d 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -46,12 +46,12 @@ mkDerivation rec { postInstall = let - binpath = makeSearchPath "bin" ( + binpath = makeBinPath ( filter (x: x != null) [ out git bazaar cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); - pythonpath = makeSearchPath (python27.sitePackages) ( + pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] ( filter (x: x != null) [ python27Packages.readline or null python27Packages.hglib or null ] ); diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 292d6fc934b5a..51d70156e9ced 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pkg_path = "$out/${name}"; bin_path = "$out/bin"; install_freedesktop_items = ./install_freedesktop_items.sh; - runtime_paths = lib.makeSearchPath "bin" [ + runtime_paths = lib.makeBinPath [ jre #git mercurial subversion # the paths are requested in configuration which diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 08b07b64b68b0..da21c29e6f9ff 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -26,6 +26,9 @@ let inherit sha256; }; + # Can't do separate $lib and $bin, as libs reference bins + outputs = [ "dev" "out" "man" ]; + buildInputs = [ zlib apr aprutil sqlite ] ++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional pythonBindings python @@ -65,6 +68,12 @@ let mkdir -p $out/share/bash-completion/completions cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion + + for f in $out/lib/*.la; do + substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" + substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib" + substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" + done ''; inherit perlBindings pythonBindings; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index ec20122d0ce83..60e713512081a 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,25 +1,24 @@ -{ pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }: +{lib, fetchurl, mercurial, pythonPackages}: -pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.6"; + version = "3.7.1"; namePrefix = ""; - src = pkgs.fetchurl { + src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "ec43d13f029bb23a12129d2a2c3b3b4daf3d8121cbb5c9c23e4872f7b0b75ad8"; + sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6"; }; - pythonPath = [ pkgs.pyqt4 mercurial ] - ++ (with pyPackages; [qscintilla iniparse]); + pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; - propagatedBuildInputs = with pyPackages; [ qscintilla iniparse ]; + propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; doCheck = false; postUnpack = '' substituteInPlace $sourceRoot/setup.py \ - --replace "/usr/share/" "$out/share/" + --replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'" ''; postInstall = '' diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 177f3d1b20c99..96017a7ba19c6 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir -, zlib, gettext, libvdpau, libva, libXv, sqlite, x265 -, yasm, fribidi, gtk3, qt4 +, zlib, gettext, libvdpau, libva, libXv, sqlite +, yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, withX265 ? true, x265 , withX264 ? true, x264 +, withXvid ? true, xvidcore , withLAME ? true, lame , withFAAC ? false, faac , withVorbis ? true, libvorbis @@ -11,8 +13,7 @@ , withVPX ? true, libvpx }: -stdenv.mkDerivation rec { - name = "avidemux-${version}"; +let version = "2.6.12"; src = fetchurl { @@ -20,96 +21,108 @@ stdenv.mkDerivation rec { sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn"; }; - nativeBuildInputs = [ cmake pkgconfig yasm lndir ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite x265 fribidi gtk3 qt4 ] - ++ lib.optional withX264 x264 - ++ lib.optional withLAME lame - ++ lib.optional withFAAC faac - ++ lib.optional withVorbis libvorbis - ++ lib.optional withPulse libpulseaudio - ++ lib.optional withFAAD faad2 - ++ lib.optional withOpus libopus - ++ lib.optional withVPX libvpx - ; - - enableParallelBuilding = false; - - outputs = [ "out" "cli" "gtk" "qt4" ]; - - patches = [ ./dynamic_install_dir.patch ]; - - buildCommand = '' - unpackPhase - cd "$sourceRoot" - patchPhase - - export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" - - function buildOutput() { - ( plugin_ui="$1" - output_dir="$2" - shift 2 - export cmakeFlags="$cmakeFlags -DPLUGIN_UI=$plugin_ui -DCMAKE_INSTALL_PREFIX=$output_dir" - for i in "$@" avidemux_plugins; do - ( cd "$i" - cmakeConfigurePhase - buildPhase - installPhase - ) - done - rm -rf avidemux_plugins/build - ) - } - - function buildUi() { - plugin_ui="$1" - output_dir="$2" - shift 2 - - # Hack to split builds properly - mkdir -p $output_dir - lndir $out $output_dir - buildOutput $plugin_ui $output_dir "$@" - } - - function fixupUi() { - output_dir="$1" - shift - - find $output_dir -lname $out\* -delete - find $output_dir -type f | while read -r f; do - rpath="$(patchelf --print-rpath $f 2>/dev/null)" || continue - new_rpath="" - IFS=':' read -ra old_rpath <<< "$rpath" - for p in "''${old_rpath[@]}"; do - new_rpath="$new_rpath:$p" - if [[ $p = $output_dir* ]]; then - new_rpath="$new_rpath:$out/''${p#$output_dir}" - fi - done - patchelf --set-rpath "$new_rpath" $f - patchelf --shrink-rpath $f + common = { + inherit version src; + + patches = [ ./dynamic_install_dir.patch ]; + + enableParallelBuilding = false; + + nativeBuildInputs = [ cmake pkgconfig yasm ]; + buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] + ++ lib.optional withX264 x264 + ++ lib.optional withX265 x265 + ++ lib.optional withXvid xvidcore + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optional withVPX libvpx + ; + + meta = { + homepage = http://fixounet.free.fr/avidemux/; + description = "Free video editor designed for simple video editing tasks"; + maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2; + }; + }; + + core = stdenv.mkDerivation (common // { + name = "avidemux-${version}"; + + preConfigure = '' + cd avidemux_core + ''; + }); + + buildPlugin = args: stdenv.mkDerivation (common // { + name = "avidemux-${args.pluginName}-${version}"; + + buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ]; + + cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ]; + + passthru.isUi = args.isUi or false; + + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase + + mkdir $out + lndir ${core} $out + + export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" + + for i in ${toString (args.buildDirs or [])} avidemux_plugins; do + ( cd "$i" + cmakeConfigurePhase + buildPhase + installPhase + ) done - } - - buildOutput COMMON $out avidemux_core - buildOutput SETTINGS $out - buildUi CLI $cli avidemux/cli - buildUi GTK $gtk avidemux/gtk - buildUi QT4 $qt4 avidemux/qt4 - - fixupPhase - - fixupUi $cli - fixupUi $gtk - fixupUi $qt4 - ''; - - meta = { - homepage = http://fixounet.free.fr/avidemux/; - description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + + fixupPhase + ''; + }); + +in { + avidemux_core = core; + + avidemux_cli = buildPlugin { + pluginName = "cli"; + pluginUi = "CLI"; + isUi = true; + buildDirs = [ "avidemux/cli" ]; + }; + + avidemux_qt4 = buildPlugin { + pluginName = "qt4"; + buildInputs = [ qt4 ]; + pluginUi = "QT4"; + isUi = true; + buildDirs = [ "avidemux/qt4" ]; + }; + + avidemux_gtk = buildPlugin { + pluginName = "gtk"; + buildInputs = [ gtk3 ]; + pluginUi = "GTK"; + isUi = true; + buildDirs = [ "avidemux/gtk" ]; + }; + + avidemux_common = buildPlugin { + pluginName = "common"; + pluginUi = "COMMON"; + }; + + avidemux_settings = buildPlugin { + pluginName = "settings"; + pluginUi = "SETTINGS"; }; } diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix index ad41f56d39d26..1d1c66cb9fe5f 100644 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ b/pkgs/applications/video/avidemux/wrapper.nix @@ -1,15 +1,18 @@ -{ buildEnv, avidemux, makeWrapper +{ buildEnv, avidemux_unwrapped, makeWrapper # GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 , withUi ? "qt4" }: -let - ui = builtins.getAttr withUi avidemux; +let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in -in buildEnv { - name = "avidemux-${withUi}-" + avidemux.version; +assert ui.isUi; - paths = [ avidemux ui ]; +buildEnv { + name = "avidemux-${withUi}-" + ui.version; + + paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; + + ignoreCollisions = true; buildInputs = [ makeWrapper ]; @@ -26,4 +29,6 @@ in buildEnv { wrapProgram $i --set ADM_ROOT_DIR $out done ''; + + meta = ui.meta; } diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index d8ec715a38cb6..06dcaf31b443f 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--enable-subtitle" "--enable-ffms2" (enableFeature avxeditSupport "avxedit") - "--with-jpeg=${libjpeg}/lib" + "--with-jpeg=${libjpeg.out}/lib" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index f1a999e5554ef..f9301781fc101 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeQtWrapper , libX11, libxcb, mesa , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras , ffmpeg @@ -27,9 +27,6 @@ assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; -let qtPath = makeSearchPath "lib/qt5/qml" [ qtdeclarative qtquickcontrols ]; -in - stdenv.mkDerivation rec { name = "bomi-${version}"; version = "0.9.11"; @@ -56,6 +53,7 @@ stdenv.mkDerivation rec { libvdpau libva libbluray + qtdeclarative qtquickcontrols ] ++ optional jackSupport jack @@ -74,8 +72,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/bomi \ - --set QML2_IMPORT_PATH ${qtPath} \ + wrapQtProgram $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -87,7 +84,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl python which qttools makeWrapper ]; + nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 961471cd9b36c..e634a0caa3f4b 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ - --replace '"ffmpeg"' '"${ffmpeg}/bin/ffmpeg"' \ - --replace '"ffmpeg ' '"${ffmpeg}/bin/ffmpeg ' + --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' ''; configurePhase = '' diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index fe95c2c6d7d89..040a7a2e7a69e 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -4,7 +4,7 @@ let wrapper = writeScript "dvd-slideshow.sh" '' #!/bin/bash # wrapper script for dvd-slideshow programs - export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH + export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg.bin}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH dir=`dirname "$0"` exe=`basename "$0"` diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index f53ce93328bfb..0200b0c70f4e9 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { for lib in $libs; do echo -n "$lib " >> macros/libslist done - echo -n "${stdenv.glibc}/lib" >> macros/libslist + echo -n "${stdenv.glibc.out}/lib" >> macros/libslist # Make sure to honor $TMPDIR, for chroot builds. for file in configure gui/Makefile.in Makefile.in @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags=" \ - --with-sdl-incl=${SDL}/include/SDL \ + --with-sdl-incl=${SDL.dev}/include/SDL \ --with-npapi-plugindir=$out/plugins \ --enable-media=gst \ --without-gconf diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 7217f4746c8fd..22b47c532e5fc 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -34,9 +34,9 @@ python3Packages.buildPythonApplication rec { preFixup = '' wrapProgram $out/bin/kazam \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share" \ + --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \ --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; ''; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index c2b3914f85026..6b21f0f65165f 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper , pkgconfig, cmake, gnumake, yasm, pythonFull , boost, avahi, libdvdcss, lame, autoreconfHook -, gettext, pcre, yajl, fribidi, which +, gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre , libX11, xproto, inputproto, libxml2 , libXt, libXmu, libXext, xextproto @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { makeWrapper libxml2 gnutls pkgconfig cmake gnumake yasm pythonFull boost libmicrohttpd autoreconfHook - gettext pcre yajl fribidi libva + gettext pcre-cpp yajl fribidi libva openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto which libXt libXmu libXext xextproto @@ -110,15 +110,9 @@ in stdenv.mkDerivation rec { --prefix PATH ":" "${pythonFull}/bin" \ --prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \ - --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${SDL2}/lib" + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ] + }" done ''; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 66f249b8e4a50..07d60fe4764bc 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { sed -i -e 's|/usr/bin/||' -e 's|/usr||' \ -e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py - sed -i -e 's|default="/usr/bin/ffmpeg"|default="${ffmpeg}/bin/ffmpeg"|' \ + sed -i -e 's|default="/usr/bin/ffmpeg"|default="${ffmpeg.bin}/bin/ffmpeg"|' \ plat/options.py sed -i -e 's|/usr/share/miro/themes|'"$out/share/miro/themes"'|' \ @@ -64,7 +64,7 @@ buildPythonApplication rec { mv "$out/bin/miro.real" "$out/bin/miro" wrapProgram "$out/bin/miro" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7fb62a5e1acce..dd5f25d3a6c6b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, docutils, makeWrapper, perl, pkgconfig, python, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, lua, lua5_sockets +, libuchardet, rubberband , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -59,11 +60,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1fiqxx85s418qynq2fp0v7cpzrz8j285hwmc4fqgn5ny1vg1jdpw"; + sha256 = "0vms3viwqcwl1mrgmf2yy4c69fvv7xpbkyrl693l6zpwynqd4b30"; }; patchPhase = '' @@ -89,7 +90,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs lua lua5_sockets + ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet rubberband ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 74f9c1604b22b..d2400475a0b35 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qtbase ]; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + runHook preConfigure + qmake PREFIX=$out + runHook postConfigure + ''; postInstall = '' mkdir -p $out/share/shotcut diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a84f24a303a20..a23bb9a1a9426 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,13 +9,13 @@ , libvdpau, libsamplerate, live555, fluidsynth , onlyLibVLC ? false , qt4 ? null -, withQt5 ? false, qtbase ? null +, withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false }: with stdenv.lib; -assert (withQt5 -> qtbase != null); +assert (withQt5 -> qtbase != null && qtx11extras != null); assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { fluidsynth ] ++ [(if withQt5 then qtbase else qt4)] + ++ optional withQt5 qtx11extras ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 952ae1f922d29..8c420b11f55c6 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -143,8 +143,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional busMouse "--enable-busmouse" ; - NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/ -I${libtool}/include/"; - NIX_LDFLAGS="-L${libtool}/lib"; + NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/"; + NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 65bb6e61117c3..9be979057dc04 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -22,12 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs - iptables e2fsprogs systemd pkgconfig + iptables e2fsprogs systemd pkgconfig stdenv.glibc stdenv.glibc.static ]; dontStrip = true; - DOCKER_BUILDTAGS = [ "journald" ]; + DOCKER_BUILDTAGS = [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; buildPhase = '' patchShebangs . @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" + --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 61a366f7ab081..bbce75b5e51eb 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { ldap ldappool webtest requests2 oslotest pep8 pymongo which ]; - makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"]; + makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; postInstall = '' # install .ini files diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 60599d18922cf..e31ed7e509c5d 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7 + PasteDeploy m2crypto ipy twisted distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 6064972fe9567..d3c2e9e806a87 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted sqlalchemy_migrate + PasteDeploy m2crypto ipy twisted distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e7232f056da74..ce7780277d769 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -83,14 +83,14 @@ in stdenv.mkDerivation { -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -i configure - ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 - ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 + ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' - s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g - s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g + s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g + s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g ${optionalString pulseSupport '' - s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g + s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g ''} ' src/VBox/Main/xml/Settings.cpp \ src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ @@ -197,6 +197,9 @@ in stdenv.mkDerivation { passthru = { inherit version; /* for guest additions */ }; + # Workaround for https://github.com/NixOS/patchelf/issues/93 (can be removed once this issue is addressed) + dontPatchELF = true; + meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1c85723c39581..a898325f63562 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -65,19 +65,19 @@ stdenv.mkDerivation { for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf do ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i '' else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i done for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib:${dbus}/lib:${libXcomposite}/lib:${libXdamage}/lib:${libXext}/lib:${libXfixes}/lib $i + patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 74cc7531e4cbe..a62a1a2009239 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation { --replace /usr/bin/pkill ${procps}/bin/pkill substituteInPlace tools/xenstat/Makefile \ - --replace /usr/include/curses.h ${ncurses}/include/curses.h + --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \ --replace /usr/include/pci ${pciutils}/include/pci diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2991169a7025b..d4721c9920082 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { #cmakeFlags = "-DGENERATE_MANPAGES=ON"; - LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; - GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; + GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index fbe7e33baadc1..641716ab2fc01 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { - name = "bspwm-0.9"; - + name = "bspwm-${version}"; + version = "0.9.1"; + src = fetchurl { - url = "https://github.com/baskerville/bspwm/archive/0.9.tar.gz"; - sha256 = "1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde"; + url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz"; + sha256 = "11dvfcvr8bc116yb3pvl0k1h2gfm9rv652jbxd1c5pmc0yimifq2"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' make PREFIX=$out ''; - + installPhase = '' make PREFIX=$out install ''; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index aded77a466da0..77263293847c4 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,7 +1,7 @@ { gestures ? false , stdenv, fetchurl, pkgconfig , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama -, libXpm, librsvg, libpng, fribidi, perl +, libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cairo fontconfig freetype - libXft libXcursor libXinerama libXpm + libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl ] ++ stdenv.lib.optional gestures libstroke; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index adbdef5e2844a..540e5d1c1e6f5 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg, - libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libpng, - libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext, + libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libXmu, + libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext, freetype, fontconfig }: stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1406"; + version = "1495"; src = fetchurl { url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; - sha256 = "0yk22b7cshhyfpcqnb4p59yxspx95xg9yp1kmkxi2fyw95cacab4"; + sha256 = "0sn9la3k36k1d9qyxab1sbv2mqicq2w7q4wgy4bj8d48zc8xjy6v"; }; - nativeBuildInputs = [ pkgconfig automake autoconf libtool which ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool which gettext ]; buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender - libXau libXdmcp libpng libjpeg expat xproto xextproto xineramaproto - librsvg gettext freetype fontconfig ]; + libXau libXdmcp libXmu libpng libjpeg expat xproto xextproto xineramaproto + librsvg freetype fontconfig ]; + + enableParallelBuilding = true; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index c671f1a4e0375..f5dd944a43d25 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl, libxcb, libXft }: +{ stdenv, fetchFromGitHub, perl, libxcb, libXft }: let version = "2015-07-23"; @@ -6,10 +6,11 @@ in stdenv.mkDerivation rec { name = "bar-xft-git-${version}"; - src = fetchgit { - url = "https://github.com/krypt-n/bar"; - rev = "020a3e1848ce03287886e9ff80b0b443e9aed543"; - sha256 = "1xzs37syhlwyjfxnk36qnij5bqa0mi53lf1k851viw4qai2bfkgr"; + src = fetchFromGitHub { + owner = "krypt-n"; + repo = "bar"; + rev = "3020df19232153f9e98ae0c8111db3de938a2719"; + sha256 = "0a54yr534jd4l5gjzpypc0y5lh2qb2wsrd662s84jjgq8bpss8av"; }; buildInputs = [ libxcb libXft perl ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index f2f864506d37a..4060b9887f79a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -24,9 +24,9 @@ buildPythonApplication rec { postPatch = '' substituteInPlace libqtile/manager.py --subst-var-by out $out - substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib} - substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango} - substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor} + substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out} + substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out} + substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out} ''; buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index f9165e0bbd48b..b78b15f7914c0 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz"; - sha256 = "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6"; + sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 862e8b0ea01ea..8c72278474764 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null -, libwebp ? null, xwayland ? null +, libwebp ? null, xwayland ? null, wayland-protocols # beware of null defaults, as the parameters *are* supplied by callPackage by default }: stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1ks8mja6glzy2dkayi535hd6w5c5h021bqk7vzgv182g33rh66ww"; + sha256 = "1hd5593zz5s3s07vb6linp6akbs62wy2ijh3g7gksafq016h1cp0"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm - mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva - libwebp + mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva + libwebp wayland-protocols ]; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" ++ stdenv.lib.optionals (xwayland != null) [ "--enable-xwayland" - "--with-xserver-path=${xwayland}/bin/Xwayland" + "--with-xserver-path=${xwayland.out}/bin/Xwayland" ]; meta = with stdenv.lib; { diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index 8c45c9c9036bb..01d75727f0bf0 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -3,6 +3,7 @@ { name, profile ? "" , pkgs ? null, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , extraBuildCommands ? "", extraBuildCommandsMulti ? "" +, extraOutputsToInstall ? [] }: # HOWTO: @@ -57,6 +58,7 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/var/setuid-wrappers:/usr/bin:/usr/sbin' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig # Force compilers to look in default search paths export NIX_CFLAGS_COMPILE='-idirafter /usr/include' @@ -118,12 +120,14 @@ let staticUsrProfileTarget = nixpkgs.buildEnv { name = "${name}-usr-target"; paths = [ etcPkg ] ++ basePkgs ++ targetPaths; + extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; staticUsrProfileMulti = nixpkgs.buildEnv { name = "system-profile-multi"; paths = multiPaths; + extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; @@ -157,8 +161,8 @@ let cp -rsHf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ # copy gcc libs - cp -rsHf ${chosenGcc.cc}/lib/* lib32/ - cp -rsHf ${chosenGcc.cc}/lib64/* lib64/ + cp -rsHf ${chosenGcc.cc.lib}/lib/* lib32/ + cp -rsHf ${chosenGcc.cc.lib}/lib64/* lib64/ # symlink 32-bit ld-linux.so ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index a9a4d95d7d8fb..dc05ec1678cb4 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -27,7 +27,7 @@ , # The package outputs to include. By default, only the default # output is included. - outputsToLink ? [] + extraOutputsToInstall ? [] , # Root the result in directory "$out${extraPrefix}", e.g. "/share". extraPrefix ? "" @@ -48,8 +48,17 @@ runCommand name meta pathsToLink extraPrefix postBuild buildInputs; pkgs = builtins.toJSON (map (drv: { paths = - [ drv ] - ++ lib.concatMap (outputName: lib.optional (drv.${outputName}.outPath or null != null) drv.${outputName}) outputsToLink; + # First add the usual output(s): respect if user has chosen explicitly, + # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed + # to exist in mkDerivation-created cases. The other cases (e.g. runCommand) + # aren't expected to have multiple outputs. + (if drv.outputUnspecified or false + && drv.meta.outputsToInstall or null != null + then map (outName: drv.${outName}) drv.meta.outputsToInstall + else [ drv ]) + # Add any extra outputs specified by the caller of `buildEnv`. + ++ lib.filter (p: p!=null) + (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall); priority = drv.meta.priority or 5; }) paths); preferLocalBuild = true; diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 8dbf2b8452bfa..688dd7be1c6ff 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin:@gnugrep@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 2bf07747337f6..0d862fe53dead 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -27,6 +27,13 @@ let ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; + libc_bin = if nativeLibc then null else libc.bin or libc; + libc_dev = if nativeLibc then null else libc.dev or libc; + libc_lib = if nativeLibc then null else libc.out or libc; + cc_solib = cc.lib or cc; + binutils_bin = if nativeTools then "" else binutils.bin or binutils; + # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. + coreutils_bin = if nativeTools then "" else coreutils.bin or coreutils; in stdenv.mkDerivation { @@ -36,15 +43,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc shell; - libc = if nativeLibc then null else libc; - binutils = if nativeTools then "" else binutils; - # The wrapper scripts use 'cat' and 'grep', so we may need coreutils - # and gnugrep. - coreutils = if nativeTools then "" else coreutils; - gnugrep = if nativeTools then "" else gnugrep; + inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; + gnugrep_bin = if nativeTools then "" else gnugrep; - passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; }; + passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; }; buildCommand = '' @@ -60,11 +62,11 @@ stdenv.mkDerivation { '' + optionalString (!nativeLibc) (if (!stdenv.isDarwin) then '' - dynamicLinker="$libc/lib/$dynamicLinker" + dynamicLinker="${libc_lib}/lib/$dynamicLinker" echo $dynamicLinker > $out/nix-support/dynamic-linker - if [ -e $libc/lib/32/ld-linux.so.2 ]; then - echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi # The dynamic linker is passed in `ldflagsBefore' to allow @@ -78,7 +80,7 @@ stdenv.mkDerivation { '') + optionalString (!nativeLibc) '' - # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link # against the crt1.o from our own glibc, rather than the one in # /usr/lib. (This is only an issue when using an `impure' # compiler/linker, i.e., one that searches /usr/lib and so on.) @@ -89,11 +91,11 @@ stdenv.mkDerivation { # compile, because it uses "#include_next <limits.h>" to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - echo "-B$libc/lib/ -idirafter $libc/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - echo "-L$libc/lib" > $out/nix-support/libc-ldflags + echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags - echo $libc > $out/nix-support/orig-libc + echo "${libc_lib}" > $out/nix-support/orig-libc '' + (if nativeTools then '' @@ -102,23 +104,23 @@ stdenv.mkDerivation { '' else '' echo $cc > $out/nix-support/orig-cc - # GCC shows $cc/lib in `gcc -print-search-dirs', but not - # $cc/lib64 (even though it does actually search there...).. + # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not + # ${cc_solib}/lib64 (even though it does actually search there...).. # This confuses libtool. So add it to the compiler tool search # path explicitly. - if [ -e "$cc/lib64" -a ! -L "$cc/lib64" ]; then - ccLDFlags+=" -L$cc/lib64" - ccCFlags+=" -B$cc/lib64" + if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then + ccLDFlags+=" -L${cc_solib}/lib64" + ccCFlags+=" -B${cc_solib}/lib64" fi - ccLDFlags+=" -L$cc/lib" + ccLDFlags+=" -L${cc_solib}/lib" ${optionalString cc.langVhdl or false '' - ccLDFlags+=" -L${zlib}/lib" + ccLDFlags+=" -L${zlib.out}/lib" ''} # Find the gcc libraries path (may work only without multilib). ${optionalString cc.langAda or false '' - basePath=`echo $cc/lib/*/*/*` + basePath=`echo ${cc_solib}/lib/*/*/*` ccCFlags+=" -B$basePath -I$basePath/adainclude" gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" echo "$gnatCFlags" > $out/nix-support/gnat-cflags @@ -134,13 +136,13 @@ stdenv.mkDerivation { echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags - ccPath="$cc/bin" - ldPath="$binutils/bin" + ccPath="${cc}/bin" + ldPath="${binutils_bin}/bin" # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). - echo $cc $binutils $libc > $out/nix-support/propagated-user-env-packages + echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' @@ -162,12 +164,12 @@ stdenv.mkDerivation { wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld} - if [ -e $binutils/bin/ld.gold ]; then - wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold + if [ -e ${binutils_bin}/bin/ld.gold ]; then + wrap ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.gold fi - if [ -e $binutils/bin/ld.bfd ]; then - wrap ld.bfd ${./ld-wrapper.sh} $binutils/bin/ld.bfd + if [ -e ${binutils_bin}/bin/ld.bfd ]; then + wrap ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.bfd fi export real_cc=cc diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 012f826a111e0..0d74527dd8add 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" fi if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 999959c8227b9..44d9a047936a5 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" fi if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 35620483d2bc0..f4f7ab181d3e0 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -22,20 +22,20 @@ envHooks+=(addCVars) # Note: these come *after* $out in the PATH (see setup.sh). -if [ -n "@binutils@" ]; then - addToSearchPath _PATH @binutils@/bin -fi - if [ -n "@cc@" ]; then addToSearchPath _PATH @cc@/bin fi -if [ -n "@libc@" ]; then - addToSearchPath _PATH @libc@/bin +if [ -n "@binutils_bin@" ]; then + addToSearchPath _PATH @binutils_bin@/bin +fi + +if [ -n "@libc_bin@" ]; then + addToSearchPath _PATH @libc_bin@/bin fi -if [ -n "@coreutils@" ]; then - addToSearchPath _PATH @coreutils@/bin +if [ -n "@coreutils_bin@" ]; then + addToSearchPath _PATH @coreutils_bin@/bin fi if [ -z "$crossConfig" ]; then diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8e4a51071e330..f874354b15ed8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript -, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages }: +, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages, pigz }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -45,27 +45,6 @@ rec { done ''; - mkTarball = { name ? "docker-tar", drv, onlyDeps ? false }: - runCommand "${name}.tar.gz" rec { - inherit drv onlyDeps; - - drvClosure = writeReferencesToFile drv; - - } '' - while read dep; do - echo Copying $dep - dir="$(dirname "$dep")" - mkdir -p "rootfs/$dir" - cp -drf --preserve=mode $dep "rootfs/$dir/" - done < "$drvClosure" - - if [ -z "$onlyDeps" ]; then - cp -drf --preserve=mode $drv/* rootfs/ - fi - - tar -C rootfs/ -cpzf $out . - ''; - shellScript = text: writeScript "script.sh" '' #!${stdenv.shell} @@ -99,16 +78,6 @@ EOF fi ''; - # Append to tar instead of unpacking - mergeTarballs = tarballs: - runCommand "merge-tars" { inherit tarballs; } '' - mkdir tmp - for tb in $tarballs; do - tar -C tmp -xkpf $tb - done - tar -C tmp -cpzf $out . - ''; - runWithOverlay = { name , fromImage ? null, fromImageName ? null, fromImageTag ? null , diskSize ? 1024, preMount ? "", postMount ? "", postUmount ? "" }: vmTools.runInLinuxVM ( @@ -182,7 +151,7 @@ EOF postMount = '' echo Packing raw image - tar -C mnt -czf $out . + tar -C mnt --mtime=0 -cf $out . ''; }; @@ -207,7 +176,7 @@ EOF echo Packing layer mkdir $out - tar -C layer -cf $out/layer.tar . + tar -C layer --mtime=0 -cf $out/layer.tar . ts=$(${tarsum} < $out/layer.tar) cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json echo -n "1.0" > $out/VERSION @@ -247,7 +216,7 @@ EOF echo Packing layer mkdir $out - tar -C layer -cf $out/layer.tar . + tar -C layer --mtime=0 -cf $out/layer.tar . ts=$(${tarsum} < $out/layer.tar) cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json echo -n "1.0" > $out/VERSION @@ -262,8 +231,8 @@ EOF # 6. repack the image buildImage = args@{ name, tag ? "latest" , fromImage ? null, fromImageName ? null, fromImageTag ? null - , contents ? null, tarballs ? [], config ? null - , runAsRoot ? null, diskSize ? 1024, extraCommands ? "" }: + , contents ? null, config ? null, runAsRoot ? null + , diskSize ? 1024, extraCommands ? "" }: let @@ -275,22 +244,18 @@ EOF os = "linux"; config = config; }); - + layer = (if runAsRoot == null then mkPureLayer { inherit baseJson contents extraCommands; } else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); - depsTarball = mkTarball { name = "${baseName}-deps"; - drv = layer; - onlyDeps = true; }; - result = runCommand "${baseName}.tar.gz" { - buildInputs = [ jshon ]; + buildInputs = [ jshon pigz ]; imageName = name; imageTag = tag; inherit fromImage baseJson; - mergedTarball = if tarballs == [] then depsTarball else mergeTarballs ([ depsTarball ] ++ tarballs); + layerClosure = writeReferencesToFile layer; passthru = { buildArgs = args; @@ -320,22 +285,20 @@ EOF mkdir temp cp ${layer}/* temp/ chmod ug+w temp/* - - echo Adding dependencies + + # FIXME: might not be /nix/store + echo '/nix' >> layerFiles + echo '/nix/store' >> layerFiles + for dep in $(cat $layerClosure); do + find $dep >> layerFiles + done + + echo Adding layer tar -tf temp/layer.tar >> baseFiles - tar -tf "$mergedTarball" | grep -v ${layer} > layerFiles - if [ "$(wc -l layerFiles|cut -d ' ' -f 1)" -gt 3 ]; then - sed -i -e 's|^[\./]\+||' baseFiles layerFiles - comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq) -1 -3 > newFiles - mkdir deps - pushd deps - tar -xpf "$mergedTarball" --no-recursion --files-from ../newFiles 2>/dev/null || true - tar -rf ../temp/layer.tar --no-recursion --files-from ../newFiles 2>/dev/null || true - popd - else - echo No new deps, no diffing needed - fi - + sed 's/^\.//' -i baseFiles + comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles + tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true + echo Adding meta if [ -n "$parentID" ]; then @@ -357,7 +320,7 @@ EOF chmod -R a-w image echo Cooking the image - tar -C image -czf $out . + tar -C image --mtime=0 -c . | pigz -nT > $out ''; in diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index d4b46cf9e9d42..a7c76737e1ad2 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -61,6 +61,7 @@ in , md5 ? "" , sha1 ? "" , sha256 ? "" +, sha512 ? "" , recursiveHash ? false @@ -86,12 +87,13 @@ in assert builtins.isList urls; assert (urls == []) != (url == ""); +assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; let hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != ""; + || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; urls_ = if urls != [] then urls else [url]; in @@ -114,9 +116,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; outputHash = if outputHash != "" then outputHash else - if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index 7bb487096145f..a8e8a370ec0d0 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -24,7 +24,7 @@ if test -z "$nativeLibc"; then # compile, because it uses "#include_next <limits.h>" to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + echo "-B$libc/lib/ -idirafter $libc_dev/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags echo "-L$libc/lib" > $out/nix-support/libc-ldflags @@ -39,9 +39,9 @@ if test -n "$nativeTools"; then ldPath="$nativePrefix/bin" else if test -e "$gcc/lib64"; then - gccLDFlags="$gccLDFlags -L$gcc/lib64" + gccLDFlags="$gccLDFlags -L$gcc_lib/lib64" fi - gccLDFlags="$gccLDFlags -L$gcc/lib" + gccLDFlags="$gccLDFlags -L$gcc_lib/lib" if [ -n "$langVhdl" ]; then gccLDFlags="$gccLDFlags -L$zlib/lib" fi @@ -95,6 +95,7 @@ doSubstitute() { -e "s^@binutils@^$binutils^g" \ -e "s^@coreutils@^$coreutils^g" \ -e "s^@libc@^$libc^g" \ + -e "s^@libc_bin@^$libc_bin^g" \ -e "s^@ld@^$ld^g" \ < "$src" > "$dst" } @@ -210,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh # tools like gcov, the manpages, etc. as well (including for binutils # and Glibc). if test -z "$nativeTools"; then - echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages + echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index 20f1bc97ad1b8..f44aaec5d9d77 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix gcc; + gcc_lib = gcc.lib or gcc; libc = if nativeLibc then null else libc; + libc_dev = if nativeLibc then null else libc.dev or libc; + libc_bin = if nativeLibc then null else libc.bin or libc; binutils = if nativeTools then null else binutils; # The wrapper scripts use 'cat', so we may need coreutils coreutils = if nativeTools then null else coreutils; diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh index 298ade21d1f59..d8bdf858ae58c 100644 --- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -25,7 +25,7 @@ if test -n "@binutils@"; then fi if test -n "@libc@"; then - addToSearchPath PATH @libc@/bin + addToSearchPath PATH @libc_bin@/bin fi if test -n "@coreutils@"; then diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 18719e6e22ba5..6c2e98b9cc1dc 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -114,16 +114,10 @@ let "-${grkern.grversion}-${grkern.revision}"; grsecurityOverrider = args: grkern: { - # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) - # include libgmp headers, so we need these extra tweaks - # As of gcc5 we also need libmpc - buildInputs = args.buildInputs ++ [ pkgs.gmp pkgs.libmpc pkgs.mpfr ]; - preConfigure = '' - extraIncludes="-I${pkgs.gmp}/include -I${pkgs.libmpc}/include -I${pkgs.mpfr}/include" - ${args.preConfigure or ""} - sed -i "s|-I|$extraIncludes -I|" scripts/gcc-plugin.sh - sed -i "s|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += $extraIncludes|" tools/gcc/Makefile - sed -i "s|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += $extraIncludes|" tools/gcc/Makefile + # additional build inputs for gcc plugins, required by some PaX/grsec features + nativeBuildInputs = args.nativeBuildInputs ++ (with pkgs; [ gmp libmpc mpfr ]); + + preConfigure = args.preConfigure or "" + '' rm localversion-grsec echo ${localver grkern} > localversion-grsec ''; diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh index 1dd9788419b84..f1d9cf3a3696d 100644 --- a/pkgs/build-support/setup-hooks/compress-man-pages.sh +++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh @@ -3,6 +3,7 @@ fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; f compressManPages() { local dir="$1" + if [ ! -d "$dir/share/man" ]; then return; fi echo "gzipping man pages in $dir" GLOBIGNORE=.:..:*.gz:*.bz2 diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index 57b71c15691d0..ef31dcdce2747 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -2,7 +2,7 @@ # $out/share/man to $man/share/man; and moves $out/share/doc to # $man/share/doc. -preFixupHooks+=(_moveDocs) +preFixupHooks+=(_moveToShare) _moveToShare() { forceShare=${forceShare:=man doc info} @@ -21,31 +21,3 @@ _moveToShare() { done } -_moveToOutput() { - local d="$1" - local dst="$2" - if [ -z "$dst" -a ! -e $dst/$d ]; then return; fi - local output - for output in $outputs; do - if [ "${!output}" = "$dst" ]; then continue; fi - if [ -d "${!output}/$d" ]; then - echo "moving ${!output}/$d to $dst/$d" - mkdir -p $dst/share - mv ${!output}/$d $dst/$d - break - fi - done -} - -_moveDocs() { - _moveToShare - _moveToOutput share/man "$man" - _moveToOutput share/info "$info" - _moveToOutput share/doc "$doc" - _moveToOutput share/gtk-doc "$doc" - - # Remove empty share directory. - if [ -d "$out/share" ]; then - rmdir $out/share 2> /dev/null || true - fi -} diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh new file mode 100644 index 0000000000000..2cf08d42ae04b --- /dev/null +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -0,0 +1,177 @@ +# The base package for automatic multiple-output splitting. Used in stdenv as well. +preConfigureHooks+=(_multioutConfig) +preFixupHooks+=(_multioutDocs) +preFixupHooks+=(_multioutDevs) +postFixupHooks+=(_multioutPropagateDev) + +# Assign the first string containing nonempty variable to the variable named $1 +_assignFirst() { + local varName="$1" + local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name) + shift + while [ $# -ge 1 ]; do + if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi + shift + done + echo "Error: _assignFirst found no valid variant!" + return 1 # none found +} +# Same as _assignFirst, but only if "$1" = "" +_overrideFirst() { + if [ -z "${!1}" ]; then + _assignFirst "$@" + fi +} + + +# Setup chains of sane default values with easy overridability. +# The variables are global to be usable anywhere during the build. +# Typical usage in package is defining outputBin = "dev"; + +_overrideFirst outputDev "dev" "out" +_overrideFirst outputBin "bin" "out" + +_overrideFirst outputInclude "$outputDev" + +# so-libs are often among the main things to keep, and so go to $out +_overrideFirst outputLib "lib" "out" + +_overrideFirst outputDoc "doc" "out" +_overrideFirst outputDocdev "docdev" REMOVE # documentation for developers +# man and info pages are small and often useful to distribute with binaries +_overrideFirst outputMan "man" "doc" "$outputBin" +_overrideFirst outputInfo "info" "doc" "$outputMan" + + +# Add standard flags to put files into the desired outputs. +_multioutConfig() { + if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi; + + configureFlags="\ + --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ + --includedir=${!outputInclude}/include --oldincludedir=${!outputInclude}/include \ + --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ + --docdir=${!outputDoc}/share/doc \ + --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ + --localedir=${!outputLib}/share/locale \ + $configureFlags" + + installFlags="\ + pkgconfigdir=${!outputDev}/lib/pkgconfig \ + m4datadir=${!outputDev}/share/aclocal aclocaldir=${!outputDev}/share/aclocal \ + $installFlags" +} + +# Add rpath prefixes to library paths, and avoid stdenv doing it for $out. +_addRpathPrefix "${!outputLib}" +NIX_NO_SELF_RPATH=1 + + +# Move subpaths that match pattern $1 from under any output/ to the $2 output/ +# Beware: only globbing patterns are accepted, e.g.: * ? {foo,bar} +# A special target "REMOVE" is allowed: moveToOutput foo REMOVE +moveToOutput() { + local patt="$1" + local dstOut="$2" + local output + for output in $outputs; do + if [ "${!output}" = "$dstOut" ]; then continue; fi + local srcPath + for srcPath in "${!output}"/$patt; do + if [ ! -e "$srcPath" ]; then continue; fi + + if [ "$dstOut" = REMOVE ]; then + echo "Removing $srcPath" + rm -r "$srcPath" + else + local dstPath="$dstOut${srcPath#${!output}}" + echo "Moving $srcPath to $dstPath" + + if [ -d "$dstPath" ] && [ -d "$srcPath" ] + then # attempt directory merge + # check the case of trying to move an empty directory + rmdir "$srcPath" --ignore-fail-on-non-empty + if [ -d "$srcPath" ]; then + mv -t "$dstPath" "$srcPath"/* + rmdir "$srcPath" + fi + else # usual move + mkdir -p "$(readlink -m "$dstPath/..")" + mv "$srcPath" "$dstPath" + fi + fi + + # remove empty directories, printing iff at least one gets removed + local srcParent="$(readlink -m "$srcPath/..")" + if rmdir "$srcParent"; then + echo "Removing empty $srcParent/ and (possibly) its parents" + rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \ + 2> /dev/null || true # doesn't ignore failure for some reason + fi + done + done +} + +# Move documentation to the desired outputs. +_multioutDocs() { + local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo} + + moveToOutput share/info "${!outputInfo}" + moveToOutput share/doc "${!outputDoc}" + moveToOutput share/gtk-doc "${!outputDocdev}" + + # the default outputMan is in $bin + moveToOutput share/man "${!outputMan}" + moveToOutput share/man/man3 "${!outputDocdev}" +} + +# Move development-only stuff to the desired outputs. +_multioutDevs() { + if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi; + moveToOutput include "${!outputInclude}" + # these files are sometimes provided even without using the corresponding tool + moveToOutput lib/pkgconfig "${!outputDev}" + moveToOutput share/pkgconfig "${!outputDev}" + moveToOutput lib/cmake "${!outputDev}" + moveToOutput share/aclocal "${!outputDev}" + # don't move *.la, as libtool needs them in the directory of the library + + for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; do + echo "Patching '$f' includedir to output ${!outputInclude}" + sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f" + done +} + +# Make the first output (typically "dev") propagate other outputs needed for development. +# Take the first, because that's what one gets when putting the package into buildInputs. +# Note: during the build, probably only the "native" development packages are useful. +# With current cross-building setup, all packages are "native" if not cross-building. +_multioutPropagateDev() { + if [ "$outputs" = "out" ]; then return; fi; + + local outputFirst + for outputFirst in $outputs; do + break + done + + # Default value: propagate binaries, includes and libraries + if [ -z "${propagatedBuildOutputs+1}" ]; then + local po_dirty="$outputBin $outputInclude $outputLib" + set +o pipefail + propagatedBuildOutputs=`echo "$po_dirty" \ + | tr -s ' ' '\n' | grep -v -F "$outputFirst" \ + | sort -u | tr '\n' ' ' ` + set -o pipefail + fi + + # The variable was explicitly set to empty or we resolved it so + if [ -z "$propagatedBuildOutputs" ]; then + return + fi + + mkdir -p "${!outputFirst}"/nix-support + for output in $propagatedBuildOutputs; do + echo -n " ${!output}" >> "${!outputFirst}"/nix-support/propagated-native-build-inputs + done +} + diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 774c1b700c695..e670e1ef2258d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -40,9 +40,9 @@ rec { mkdir -p $out/lib # Copy what we need from Glibc. - cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/libm.so.* $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib # Copy BusyBox. cp -pd ${pkgs.busybox}/bin/* $out/bin @@ -584,7 +584,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc}/bin:${lzma}/bin + PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 56956280feac3..3ee2242adecdf 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "03d6aqgvhcsyciwdhl50h9bwn53iivvd7rbnh8als2ia9jwm2026"; }; + # keep developer docs separately (man2 and man3) + outputs = [ "out" "docdev" ]; makeFlags = [ "MANDIR=$(out)/share/man" ]; + postFixup = ''moveToOutput share/man/man2 "$docdev" ''; meta = with stdenv.lib; { description = "Linux development manual pages"; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 3b45da914d25a..c438f839dbdaa 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -2,12 +2,14 @@ stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; - + src = fetchurl { url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; + outputDocdev = "out"; + installPhase = '' mkdir -p $out/share/man cp -R * $out/share/man diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 33c002e980132..249e5b6841bf8 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -11,13 +11,15 @@ stdenv.mkDerivation rec { sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; }; + outputDocdev = "out"; + preConfigure = " patchShebangs ./configure patchShebangs ./do_install "; buildInputs = [ curl ]; - + meta = with stdenv.lib; { description = "Formatted C++11/14 stdlib man pages (cppreference)"; longDescription = "stdman is a tool that parses archived HTML diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 81be2dfb89be1..dd681404e856c 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure qmake PREFIX=/ + runHook postConfigure ''; installPhase = '' diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix new file mode 100644 index 0000000000000..13e98462b2152 --- /dev/null +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "helvetica-neue-lt-std-${version}"; + version = "2013.06.07"; # date of most recent file in distribution + + src = fetchurl { + url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + sha256 = "0nrjdj2a11dr6d3aihvjxzrkdi0wq6f2bvaiimi5iwmpyz80n0h6"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + sourceRoot = "Helvetica Neue LT Std"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v *.otf $out/share/fonts/opentype + ''; + + meta = { + homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; + description = "Helvetica Neue LT Std font"; + longDescription = '' + Helvetica Neue Lt Std is one of the most highly rated and complete + fonts of all time. Developed in early 1983, this font has well + camouflaged heights and weights. The structure of the word is uniform + throughout all the characters. + + The legibility with Helvetica Neue LT Std is said to have improved as + opposed to other fonts. The tail of it is much longer in this + font. The numbers are well spaced and defined with high accuracy. The + punctuation marks are heavily detailed as well. + ''; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix new file mode 100644 index 0000000000000..98227605ac849 --- /dev/null +++ b/pkgs/data/fonts/profont/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "profont"; + + src = fetchurl { + url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; + sha256 = "19ww5iayxzxxgixa9hgb842xd970mwghxfz2vsicp8wfwjh6pawr"; + }; + + buildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = + '' + mkdir -p $out/share/doc/$name $out/share/fonts/misc + + cp LICENSE $out/share/doc/$name/LICENSE + + for f in *.pcf; do + gzip -c "$f" > $out/share/fonts/misc/"$f".gz + done + ''; + + meta = with stdenv.lib; { + homepage = http://tobiasjung.name; + description = "A monospaced font created to be a most readable font for programming"; + maintainers = with stdenv.lib.maintainers; [ myrl ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 1c41a92bf96c3..9a4cfb3093bcf 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; platforms = platforms.all; + maintainers = [ maintainers.myrl ]; }; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index f31c7c503a291..9cfb89914b111 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, udev }: +{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let name = "media-player-info-22"; @@ -12,7 +12,7 @@ in sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy"; }; - buildInputs = [ udev ]; + buildInputs = [ udev systemd ]; nativeBuildInputs = [ pkgconfig python3 ]; postPatch = '' diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 5b51da58e6221..8ffd213306022 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { ]; sourceRoot = "."; - outputs = [ "out" "lib" ]; + + outputs = [ "out" "man" "dev" ]; + propagatedBuildOutputs = []; makeFlags = [ "TOPDIR=$(out)" "TZDIR=$(out)/share/zoneinfo" "ETCDIR=$(TMPDIR)/etc" - "LIBDIR=$(lib)/lib" - "MANDIR=$(TMPDIR)/man" + "LIBDIR=$(dev)/lib" + "MANDIR=$(man)/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" ]; @@ -34,8 +36,8 @@ stdenv.mkDerivation rec { ln -s . $out/share/zoneinfo/posix mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right - mkdir -p "$lib/include" - cp tzfile.h "$lib/include/tzfile.h" + mkdir -p "$dev/include" + cp tzfile.h "$dev/include/tzfile.h" ''; meta = { diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index c2124f0b29283..3df091fd48a7c 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto - xorg.libX11 udev utillinux ]; + xorg.libX11 udev utillinux systemd ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; patches = [ ./efl-elua.patch ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 8c3391cf2714d..67f9c68cd613c 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -7,19 +7,23 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; }; - buildInputs = [ elementary efl automake autoconf libtool pkgconfig - makeWrapper ]; - GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ + buildInputs = [ + elementary efl automake autoconf libtool pkgconfig + makeWrapper + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-libav ]; + gst_all_1.gst-libav + ]; + configurePhase = '' ./autogen.sh --prefix=$out ''; + postInstall = '' wrapProgram $out/bin/rage \ - --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; meta = { description = "Video + Audio player along the lines of mplayer"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index f31875bed91c3..50f2cd0813323 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; }; - buildInputs = [ dbus.libs libgcrypt pam python gtk GConf libgnome_keyring ]; + buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ]; propagatedBuildInputs = [ glib libtasn1 ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 277ca9a1a6983..a126cd53432ef 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python , glib, gtk, pango, atk, libXau, libcanberra , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool}: +, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra + libtasn1 libtool libcanberra xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix index a9bb87d4dddfc..100dfbf3acec5 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" "--disable-libcryptui" ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix index b9aac0539ae5b..caff53dcc1d63 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg autoreconfHook + gnome3.gsettings_desktop_schemas gnome3.evolution_data_server gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; patches = [ ./soup.patch ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix index 4c42c6c026d3c..48b45f28522e1 100644 --- a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas file libtool librsvg ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/include/dbus-1.0" + "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; preFixup = '' for f in $out/bin/* $out/libexec/*; do diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix index 322dd3bedac6c..d50036a597e66 100644 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix index 6e200bdb3188f..4385c6b6f75b8 100644 --- a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix index 51b67afb01fd7..3749be2de27f7 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' + substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}' substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in ''; diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix index 1db969651317c..a13370e5c9a9d 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # Only needed to make it build preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix index 792e34c7b1480..ac53726bc537a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spidermonkey_24 ]; postInstall = '' - sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la + sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix index 1d1f9d18c5662..51e3f6ab31332 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-dictionary" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix index d810fbb862b72..c6688fd30cd77 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix index 763fc990bdab1..15d93793088bb 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-screenshot" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix index 11d78cd613285..2c9e54a229b3f 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix @@ -1,9 +1,10 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, sqlite, libgweather, libcanberra_gtk3 -, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: +, python3, python3Packages, libsoup, polkit, clutter, networkmanager +, docbook_xsl , docbook_xsl_ns, at_spi2_core, libstartup_notification +, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, sqlite, libgweather +, libcanberra_gtk3 , libpulseaudio, libical, libtool, nss, gobjectIntrospection +, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus +, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg + libcroco intltool libsecret pkgconfig python3 python3Packages.pygobject3 + libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm @@ -40,6 +42,9 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$out/bin/gnome-shell-extension-tool" \ + --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix index 716f92a072d46..6b7b28ad4000e 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-system-log" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix index 49ad40912c66b..e8f6498350627 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2.out}/modules" "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix index a236238c257fb..f08920efa1396 100644 --- a/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix @@ -3,11 +3,11 @@ , gmime, json_glib, avahi, tracker, itstool }: stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.13"; + name = "grilo-plugins-0.2.16"; src = fetchurl { url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; + sha256 = "00sjmkzxc8w4qn4lp5yj65c4y83mwhp0zlvk11ghvpxnklgmgd40"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix index 16dfb638a2490..f5c9a613f25ae 100644 --- a/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix @@ -2,11 +2,11 @@ , libxml2, gnome3, gobjectIntrospection, libsoup }: stdenv.mkDerivation rec { - name = "grilo-0.2.12"; + name = "grilo-0.2.14"; src = fetchurl { url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m"; + sha256 = "1k8wj8f7xfaw5hxypnmwd34li3fq8h76dacach547rvsfjhjxj3r"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix index e8ddf7096e622..76d9118c4b956 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix index 8d40d977a80b9..a0b0523524c6c 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python, pygobject3 +, glib, gtk3, gobjectIntrospection, python3, python3Packages, ncurses }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + configureFlags = [ "--enable-python3" ]; + buildInputs = [ - intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 - gnome3.defaultIconTheme + intltool pkgconfig glib gtk3 gobjectIntrospection python3 python3Packages.pygobject3 + gnome3.defaultIconTheme ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix index 13665c72274ef..cc35ede88f3ae 100644 --- a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib +, clutter_gtk, clutter-gst, python3, python3Packages, shared_mime_info +, pkgconfig, gtk3, glib, gobjectIntrospection , bash, makeWrapper, itstool, libxml2, dbus_glib , gnome3, librsvg, gdk_pixbuf, file }: @@ -17,15 +17,17 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.libpeas pygobject3 shared_mime_info dbus_glib + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav + gnome3.libpeas python3Packages.pygobject3 gobjectIntrospection shared_mime_info dbus_glib gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.gsettings_desktop_schemas makeWrapper file ]; preFixup = '' wrapProgram "$out/bin/totem" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:$GI_TYPELIB_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix index 88e6da2ad2d07..9c7fb9ce844f1 100644 --- a/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala, sqlite, libxslt +, pkgconfig, gtk3, glib, dconf +, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -8,41 +8,36 @@ , libpng, libexif, libgsf, libuuid, bzip2 }: let - majorVersion = "1.4"; + majorVersion = "1.8"; in stdenv.mkDerivation rec { name = "tracker-${majorVersion}.0"; src = fetchurl { url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz"; - sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68"; + sha256 = "0zchaahk4w7dwanqk1vx0qgnyrlzlp81krwawfx3mv5zffik27x1"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler"; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - enableParallelBuilding = true; - - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 + buildInputs = [ vala gtk3 glib dconf intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file + gnome3.gsettings_desktop_schemas wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis exempi networkmanager libpng libexif libgsf libuuid ]; - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done + enableParallelBuilding = true; + + preConfigure = '' + substituteInPlace src/libtracker-sparql/Makefile.in \ + --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix index 5ccca36bcaad5..cbb52c9aaa129 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix index 334718403a0db..38850f0fe761b 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -20,7 +20,7 @@ let baseAttrs = rec { enableParallelBuilding = true; postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix index de8b6a5e0dc6f..d0a113ff0a488 100644 --- a/pkgs/desktops/gnome-3/3.18/default.nix +++ b/pkgs/desktops/gnome-3/3.18/default.nix @@ -382,6 +382,8 @@ let gpaste = callPackage ./misc/gpaste { }; + pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; + gtkhtml = callPackage ./misc/gtkhtml { }; pomodoro = callPackage ./misc/pomodoro { }; diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix index 19f340ac291e1..e7f833bf71723 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gitg" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix index 986d4058af92e..d0c6674ad9bde 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gnome-tweak-tool" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix index eeb2cee86cdd1..fd7ecbea01ffd 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus.libs + gtk3 gnome3.gnome_control_center dbus clutter pango appstream-glib makeWrapper ]; preConfigure = "intltoolize -f"; diff --git a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix new file mode 100644 index 0000000000000..a2d8d14657955 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + version = "1.0"; + basename = "pidgin-im-gnome-shell-extension"; + name = "${basename}-${version}"; + + src = fetchFromGitHub { + owner = "muffinmad"; + repo = "${basename}"; + rev = "v${version}"; + sha256 = "0vj4w9qqx9gads24w3f6v6mfh5va28bp8rc4w7lz0vhp7njmy1yy"; + }; + + buildInputs = [ glib ]; + + configurePhase = ""; + buildPhase = ""; + installPhase = '' + share_dir="$prefix/share" + extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" + mkdir -p "$extensions_dir" + mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" + + schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" + mkdir -p "$schemas_dir" + mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ + ${glib}/bin/glib-compile-schemas "$schemas_dir" + + locale_dir="$share_dir/locale" + mkdir -p "$locale_dir" + mv locale/* $locale_dir # fix Emacs syntax highlighting: */ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; + description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 655555cd140ab..495ea242e0d0a 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -16,7 +16,7 @@ kde { nativeBuildInputs = [ shared_mime_info ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix index 267c2b7821294..f5750d60045f3 100644 --- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix @@ -9,6 +9,7 @@ kde { patches = [ (fetchurl { + name = "kopete.patch"; url = "https://bugs.kde.org/attachment.cgi?id=91567"; sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1"; }) diff --git a/pkgs/desktops/kde-5/applications-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix index 36a1ca7cfbd71..9e6f414db9e29 100644 --- a/pkgs/desktops/kde-5/applications-15.12/ark.nix +++ b/pkgs/desktops/kde-5/applications-15.12/ark.nix @@ -20,7 +20,7 @@ , zip }: -let PATH = lib.makeSearchPath "bin" [ +let PATH = lib.makeBinPath [ p7zip unrar unzipNLS zip ]; in diff --git a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix index a1f0316825dae..e4c8e9d69253d 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix +++ b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix @@ -1,14 +1,14 @@ { kdeApp , lib +, makeQtWrapper , extra-cmake-modules +, gmp , kdoctools -, makeQtWrapper , kconfig , kconfigwidgets , kguiaddons , kinit , knotifications - }: kdeApp { @@ -20,6 +20,7 @@ kdeApp { ]; buildInputs = [ + gmp kconfig kconfigwidgets kguiaddons diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix index 242f3d9c793d3..2f1fdc1d643c5 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix +++ b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation (args // { name = "${name}-${version}"; inherit src; + outputs = args.outputs or [ "dev" "out" ]; + cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_TESTING=OFF" ] diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix index 4b612ee3e3c28..e83794c60d818 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix +++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix @@ -6,6 +6,8 @@ kdeApp (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt4"; + outputs = [ "out" ]; + nativeBuildInputs = [ automoc4 cmake gettext perl ] ++ (args.nativeBuildInputs or []); @@ -17,4 +19,9 @@ kdeApp (args // { sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt ${args.preConfigure or ""} ''; + + preFixup = '' + propagatedBuildInputs= + propagatedNativeBuildInputs= + ''; }) diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix index 522fc542aeb2d..772ebe37e44f1 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix +++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix @@ -6,6 +6,8 @@ kdeApp (args // { sname = "kde-l10n-${name}"; name = "kde-l10n-${name}-qt5"; + outputs = [ "out" ]; + nativeBuildInputs = [ cmake extra-cmake-modules gettext kdoctools ] ++ (args.nativeBuildInputs or []); @@ -14,4 +16,9 @@ kdeApp (args // { sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt ${args.preConfigure or ""} ''; + + preFixup = '' + propagatedBuildInputs= + propagatedNativeBuildInputs= + ''; }) diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix index a30b19774f2a3..389362deecc61 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix @@ -2,16 +2,18 @@ , 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 +, soprano, strigi, udev, xz, pcre , lib }: kdeApp { name = "kdelibs"; + outputs = [ "out" ]; + buildInputs = [ attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 - polkit_qt4 qca2 shared_desktop_ontologies udev xz + polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre ]; propagatedBuildInputs = [ qt4 soprano phonon strigi ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix index 879262c56a417..44cc99daf261b 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix @@ -6,5 +6,5 @@ kdeFramework { name = "breeze-icons"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedUserEnvPkgs = [ qtsvg ]; + buildInputs = [ qtsvg ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix index cd314e27cacbc..2c15f31a9c9e6 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/default.nix @@ -29,6 +29,8 @@ let name = "${name}-${version}"; inherit src; + outputs = args.outputs or [ "dev" "out" ]; + cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_TESTING=OFF" ] @@ -64,14 +66,14 @@ let kdbusaddons = callPackage ./kdbusaddons.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdelibs4support = callPackage ./kdelibs4support {}; 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 {}; + kfilemetadata = callPackage ./kfilemetadata {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5b6..0000000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/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 <ttuegel@gmail.com> -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/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix index 4e1b1aff3bd14..1c2ea70442d32 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix @@ -1,9 +1,11 @@ -{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: +{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }: kdeFramework { name = "extra-cmake-modules"; - patches = [ ./0001-extra-cmake-modules-paths.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" ]; # this package has no runtime components setupHook = ./setup-hook.sh; # It is OK to propagate these inputs as long as @@ -11,8 +13,8 @@ kdeFramework { # of some other derivation. propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - meta = { - license = stdenv.lib.licenses.bsd2; - maintainers = [ lib.maintainers.ttuegel ]; + meta = with lib; { + license = licenses.bsd2; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch new file mode 100644 index 0000000000000..a74340a6dc969 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch @@ -0,0 +1,37 @@ +Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake +=================================================================== +--- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake ++++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake +@@ -200,32 +200,6 @@ + # GNUInstallDirs code deals with re-configuring, but that is dealt with + # by the _define_* macros in this module). + 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 diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series new file mode 100644 index 0000000000000..b4569e50a5f73 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series @@ -0,0 +1 @@ +nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh index a6fa6189240b0..56ed09f4ea59e 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh @@ -1,27 +1,81 @@ -addMimePkg() { - local propagated +_ecmSetXdgDirs() { + addToSearchPathOnce XDG_DATA_DIRS "$1/share" + addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg" +} - 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" +_ecmPropagateSharedData() { + local sharedPaths=( \ + "config.cfg" \ + "doc" \ + "kconf_update" \ + "kservices5" \ + "kservicetypes5" \ + "kxmlgui5" \ + "knotifications5" \ + "icons" \ + "sounds" \ + "templates" \ + "wallpapers" \ + "applications" \ + "desktop-directories" \ + "mime" \ + "info" \ + "dbus-1" \ + "interfaces" \ + "services" \ + "system-services" ) + for dir in ${sharedPaths[@]}; do + if [ -d "$1/share/$dir" ]; then + addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" + propagateOnce propagatedUserEnvPkgs "$1" + break fi + done +} - 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 +_ecmConfig() { + # Because we need to use absolute paths here, we must set *all* the paths. + cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" + cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" + cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports" + cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml" + cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" + cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share" + cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share" + cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML" + cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg" + cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update" + cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5" + cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5" + cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5" + cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5" + cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons" + cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds" + cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates" + cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers" + cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications" + cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories" + cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages" + cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata" + cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man" + cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info" + cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1" + cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces" + cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services" + cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services" + cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc" + cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg" + cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart" } -envHooks+=(addMimePkg) +envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData) +preConfigureHooks+=(_ecmConfig) diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch new file mode 100644 index 0000000000000..c66f5ecd008f8 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch @@ -0,0 +1,17 @@ +Index: kauth-5.18.0/KF5AuthConfig.cmake.in +=================================================================== +--- kauth-5.18.0.orig/KF5AuthConfig.cmake.in ++++ kauth-5.18.0/KF5AuthConfig.cmake.in +@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I + + 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_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") +-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions") ++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}") ++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") + diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix index 2b000ff3c0417..1352d8c5821f5 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, copyPathsToStore , extra-cmake-modules , kcoreaddons , polkit-qt @@ -9,7 +9,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt ]; propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./kauth-policy-install.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/series b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series new file mode 100644 index 0000000000000..d2689425c3876 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series @@ -0,0 +1 @@ +cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix new file mode 100644 index 0000000000000..843db83a99b23 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix @@ -0,0 +1,36 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kded, 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"; + outputs = [ "dev" "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kded 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/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch new file mode 100644 index 0000000000000..eabb702544830 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch @@ -0,0 +1,13 @@ +Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +=================================================================== +--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp ++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +@@ -292,7 +292,7 @@ static QString relativeInstallPath(const + return QFile::decodeName(ICON_INSTALL_DIR "/"); + } + if (strcmp("include", type) == 0) { +- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); ++ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); + } + break; + case 'l': diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series new file mode 100644 index 0000000000000..9b08ab208774a --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series @@ -0,0 +1 @@ +nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh new file mode 100644 index 0000000000000..21ac2e83b5dae --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh @@ -0,0 +1 @@ +export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix index 138c3fc33b94b..f67c19f42395a 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix @@ -4,7 +4,6 @@ kdeFramework { name = "kdoctools"; - setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch new file mode 100644 index 0000000000000..732f7b69c828d --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch @@ -0,0 +1,13 @@ +Index: kfilemetadata-5.18.0/src/CMakeLists.txt +=================================================================== +--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt ++++ kfilemetadata-5.18.0/src/CMakeLists.txt +@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K + + install(EXPORT KF5FileMetaDataTargets + NAMESPACE KF5:: +- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData ++ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData + FILE KF5FileMetaDataTargets.cmake) + + install(FILES diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix new file mode 100644 index 0000000000000..9bb4831cf8da2 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules +, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +}: + +kdeFramework { + name = "kfilemetadata"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series new file mode 100644 index 0000000000000..d2689425c3876 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series @@ -0,0 +1 @@ +cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix index 03b7c7c2f51d4..3a27d85b9166e 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix @@ -4,11 +4,10 @@ kdeFramework { name = "kservice"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedNativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ kdoctools ]; buildInputs = [ kcrash kdbusaddons ]; propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - propagatedUserEnvPkgs = [ kcoreaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ./0002-no-canonicalize-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix index 46e3cb37d1127..5ade5f63a8d04 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix +++ b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix @@ -1,7 +1,7 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets -, kcoreaddons, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper -}: +, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes +, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, makeQtWrapper }: kdeFramework { name = "kwallet"; diff --git a/pkgs/desktops/kde-5/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix index c9fcbdd8e6a06..384fa6f6d272f 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/default.nix @@ -26,7 +26,7 @@ let name = "${name}-${version}"; inherit src; - setupHook = args.setupHook or ./setup-hook.sh; + outputs = args.outputs or [ "dev" "out" ]; cmakeFlags = (args.cmakeFlags or []) @@ -48,8 +48,11 @@ let 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-gtk breeze-qt4 breeze-qt5 ]; + let + version = (builtins.parseDrvName breeze-qt5.name).version; + in + symlinkJoin "breeze-${version}" + (map (pkg: pkg.out or pkg) [ 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 {}; diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix index 6b41599994d5f..ab8867520b380 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix @@ -22,7 +22,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ ki18n kio ]; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix index 2cfd0df2e1d35..a521a79936281 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix @@ -23,11 +23,6 @@ plasmaPackage { qtdeclarative qtgraphicaleffects ]; - propagatedUserEnvPkgs = [ - libkscreen # D-Bus service - qtdeclarative # QML import - qtgraphicaleffects # QML import - ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix index a73060ad1af17..5f27efc7f24ca 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix @@ -60,9 +60,6 @@ plasmaPackage rec { qtquickcontrols qtx11extras ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ ./0001-qt-5.5-QML-import-paths.patch (substituteAll { diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix index afd8a18bbbd6a..7088f45d64e29 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix @@ -17,7 +17,4 @@ plasmaPackage rec { baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix index 2d9364d446ebb..01c5c63ce0aa8 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix @@ -11,7 +11,7 @@ , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: -plasmaPackage rec { +plasmaPackage { name = "plasma-workspace"; nativeBuildInputs = [ @@ -20,10 +20,11 @@ plasmaPackage rec { makeQtWrapper ]; buildInputs = [ - kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libSM libXcursor networkmanager-qt pam phonon - qtscript wayland + dbus_tools kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit + kinit kjsembed knewstuff knotifyconfig kpackage kservice + ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM + libXcursor mkfontdir networkmanager-qt pam phonon qtscript qttools + socat wayland xmessage xprop xset xsetroot ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel @@ -32,13 +33,31 @@ plasmaPackage rec { ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - inherit bash coreutils gnused gnugrep socat; - inherit kconfig kinit kservice qttools; - inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot; + postPatch = '' - substituteAllInPlace startkde/startkde.cmake + substituteInPlace startkde/startkde.cmake \ + --subst-var-by bash $(type -P bash) \ + --subst-var-by sed $(type -P sed) \ + --subst-var-by grep $(type -P grep) \ + --subst-var-by socat $(type -P socat) \ + --subst-var-by kcheckrunning $(type -P kcheckrunning) \ + --subst-var-by xmessage $(type -P xmessage) \ + --subst-var-by tr $(type -P tr) \ + --subst-var-by qtpaths $(type -P qtpaths) \ + --subst-var-by qdbus $(type -P qdbus) \ + --subst-var-by dbus-launch $(type -P dbus-launch) \ + --subst-var-by mkfontdir $(type -P mkfontdir) \ + --subst-var-by xset $(type -P xset) \ + --subst-var-by xsetroot $(type -P xsetroot) \ + --subst-var-by xprop $(type -P xprop) \ + --subst-var-by start_kdeinit_wrapper "${kinit.out}/lib/libexec/kf5/start_kdeinit_wrapper" \ + --subst-var-by kwrapper5 $(type -P kwrapper5) \ + --subst-var-by kdeinit5_shutdown $(type -P kdeinit5_shutdown) \ + --subst-var-by kbuildsycoca5 $(type -P kbuildsycoca5) \ + --subst-var-by kreadconfig5 $(type -P kreadconfig5) \ + --subst-var out substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; postInstall = '' diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch index 802c92da64d07..eea0ae4c199d2 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch +++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch @@ -1,10 +1,10 @@ -Index: plasma-workspace-5.5.1/startkde/startkde.cmake +Index: plasma-workspace-5.5.5/startkde/startkde.cmake =================================================================== ---- plasma-workspace-5.5.1.orig/startkde/startkde.cmake -+++ plasma-workspace-5.5.1/startkde/startkde.cmake -@@ -1,8 +1,31 @@ +--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake ++++ plasma-workspace-5.5.5/startkde/startkde.cmake +@@ -1,8 +1,36 @@ -#!/bin/sh -+#!@bash@/bin/bash ++#!@bash@ # # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # @@ -29,13 +29,18 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake +# in Trolltech.conf. A better solution would be to stop +# Qt from doing this wackiness in the first place. +if [ -e $HOME/.config/Trolltech.conf ]; then -+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf ++ @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf +fi + ++# (NixOS) We run kbuildsycoca5 before starting the user session because things ++# may be missing or moved if they have run nixos-rebuild and it may not be ++# possible for them to start Konsole to run it manually! ++@kbuildsycoca5@ ++ if test "x$1" = x--failsafe; then KDE_FAILSAFE=1 # General failsafe flag KWIN_COMPOSE=N # Disable KWin's compositing -@@ -17,29 +40,16 @@ trap 'echo GOT SIGHUP' HUP +@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -54,13 +59,13 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake - # Check if a KDE session already is running and whether it's possible to connect to X -kcheckrunning -+@out@/bin/kcheckrunning ++@kcheckrunning@ kcheckrunning_result=$? if test $kcheckrunning_result -eq 0 ; then - echo "KDE seems to be already running on this display." - xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null + echo "KDE seems to be already running on this display." -+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." ++ @xmessage@ -geometry 500x100 "KDE seems to be already running on this display." exit 1 elif test $kcheckrunning_result -eq 2 ; then echo "\$DISPLAY is not set or cannot connect to the X server." @@ -69,7 +74,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake fi # Boot sequence: -@@ -57,13 +67,8 @@ fi +@@ -57,13 +72,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys @@ -80,12 +85,12 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake -fi - -mkdir -p $configDir -+configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation) ++configDir=$(@qtpaths@ --writable-path GenericConfigLocation) +mkdir -p "$configDir" #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <<EOF -@@ -102,42 +107,10 @@ XftSubPixel=none +@@ -102,42 +112,10 @@ XftSubPixel=none EOF } @@ -126,15 +131,15 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake returncode=$? if test $returncode -ne 0; then - xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." ++ @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." exit 1 fi [ -r $configDir/startupconfig ] && . $configDir/startupconfig -@@ -146,9 +119,11 @@ if test "$kdeglobals_kscreen_scalefactor +@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor fi -+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":") ++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":") +export XCURSOR_PATH + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver @@ -143,7 +148,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" if test $? -eq 10; then -@@ -164,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursorthem +@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem fi fi @@ -160,7 +165,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake +# If the user has overwritten fonts, the cursor font may be different now +# so don't move this up. +# -+@xsetroot@/bin/xsetroot -cursor_name left_ptr ++@xsetroot@ -cursor_name left_ptr dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment @@ -168,14 +173,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake +# Make sure that D-Bus is running +# D-Bus autolaunch is broken +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -+ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session` ++ eval `@dbus-launch@ --sh-syntax --exit-with-session` +fi -+if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then ++if @qdbus@ >/dev/null 2>/dev/null; then + : # ok +else + echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" ++ @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" + exit 1 +fi + @@ -189,26 +194,26 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake ;; None) ;; -@@ -201,8 +194,7 @@ fi +@@ -201,8 +199,7 @@ fi # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. -# TODO: Use GenericConfigLocation once we depend on Qt 5.4 -scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') ++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g') # Add /env/ to the directory to locate the scripts to be sourced for prefix in `echo $scriptpath`; do -@@ -232,7 +224,7 @@ usr_odir=$HOME/.fonts/kde-override +@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override usr_fdir=$HOME/.fonts if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` ++ kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'` sys_odir=$kdedirs_first/share/fonts/override sys_fdir=$kdedirs_first/share/fonts else -@@ -245,23 +237,13 @@ fi +@@ -245,23 +242,13 @@ fi # add the user's dirs to the font path, as they might simply have been made # read-only by the administrator, for whatever reason. @@ -216,10 +221,10 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake -test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") -test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") -test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" ++test -d "$sys_odir" && @xset@ +fp "$sys_odir" ++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" ) ++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" ) ++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir" # Ask X11 to rebuild its font list. -xset fp rehash @@ -233,11 +238,11 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake -# so don't move this up. -# -xsetroot -cursor_name left_ptr -+@xset@/bin/xset fp rehash ++@xset@ fp rehash # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then -@@ -274,26 +256,6 @@ fi +@@ -274,26 +261,6 @@ fi echo 'startkde: Starting up...' 1>&2 @@ -264,96 +269,88 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -318,11 +280,11 @@ fi +@@ -318,11 +285,11 @@ fi # KDE_FULL_SESSION=true export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 KDE_SESSION_UID=`id -ru` export KDE_SESSION_UID -@@ -332,11 +294,11 @@ export XDG_CURRENT_DESKTOP +@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP # At this point all the environment is ready, let's send it to kwalletd if running if test -n "$PAM_KWALLET_LOGIN" ; then - env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN ++ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN fi # ...and also to kwalletd5 if test -n "$PAM_KWALLET5_LOGIN" ; then - env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN ++ env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN fi # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -349,21 +311,26 @@ if test $? -ne 0; then +@@ -349,18 +316,18 @@ if test $? -ne 0; then # Startup error echo 'startkde: Could not sync environment to dbus.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." ++ @xmessage@ -geometry 500x100 "Could not sync environment to dbus." exit 1 fi # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup if test $? -ne 0; then # Startup error echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." ++ @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kservice@/bin/kbuildsycoca5 -+ - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence - # if the KDEWM environment variable has been set, then it will be used as KDE's @@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+@kinit@/bin/kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS ++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." ++ @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation." fi -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true` if test x"$wait_drkonqi"x = x"true"x ; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 - while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do sleep 5 wait_drkonqi_counter=$((wait_drkonqi_counter+5)) if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then # ask remaining drkonqis to die in a graceful way - $qdbus | grep 'org.kde.drkonqi-' | while read address ; do - $qdbus "$address" "/MainApplication" "quit" -+ @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do -+ @qttools@/bin/qdbus "$address" "/MainApplication" "quit" ++ @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do ++ @qdbus@ "$address" "/MainApplication" "quit" done break fi @@ -362,14 +359,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake # Clean up -kdeinit5_shutdown -+@kinit@/bin/kdeinit5_shutdown ++@kdeinit5_shutdown@ unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION -+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION ++@xprop@ -root -remove KDE_FULL_SESSION unset KDE_SESSION_VERSION -xprop -root -remove KDE_SESSION_VERSION -+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION ++@xprop@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix new file mode 100644 index 0000000000000..b75c09d2909de --- /dev/null +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + name = "lxmenu-data-${version}"; + version = "0.1.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz"; + sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; + }; + + buildInputs = [ intltool ]; + + meta = { + homepage = "http://lxde.org/"; + license = stdenv.lib.licenses.gpl2; + description = "Freedesktop.org desktop menus for LXDE"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 83610a4e4a652..4d3f09105433c 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }: +{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util +, hicolor_icon_theme }: stdenv.mkDerivation rec { p_name = "exo"; @@ -11,9 +12,11 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ]; + outputs = [ "dev" "out" "docdev" ]; + # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ]; meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 8f8cfff76cd45..4fffc9e1ec9f8 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -1,22 +1,26 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }: - -stdenv.mkDerivation rec { +let p_name = "garcon"; ver_maj = "0.4"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + outputs = [ "dev" "out" ]; buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/; description = "Xfce menu support library"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } + diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 2cb20febcb943..6bdeb50f83993 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,40 +1,38 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf -, libglade, libstartup_notification +, libglade, libstartup_notification, hicolor_icon_theme , withGtk3 ? false, gtk3 }: - -with { inherit (stdenv.lib) optional; }; - -stdenv.mkDerivation rec { +let p_name = "libxfce4ui"; ver_maj = "4.12"; ver_min = "1"; + inherit (stdenv.lib) optional; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: gladeui - # Install into our own prefix instead. - configureFlags = [ - "--with-libglade-module-path=$out/lib/libglade/2.0" - ] ++ optional withGtk3 "--enable-gtk3"; + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification + libstartup_notification hicolor_icon_theme ] ++ optional withGtk3 gtk3; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + #TODO: glade? + configureFlags = optional withGtk3 "--enable-gtk3"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } + diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 6893d7cfb20b2..cab904f551070 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, pkgconfig, glib, intltool }: - -stdenv.mkDerivation rec { +let p_name = "libxfce4util"; ver_maj = "4.12"; ver_min = "1"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig glib intltool ]; @@ -20,3 +23,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } + diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 32a320c779bf5..d9e5cce25e852 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -1,31 +1,32 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk -, libxfce4util, xfconf, libglade, libstartup_notification }: - -stdenv.mkDerivation rec { +, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }: +let p_name = "libxfcegui4"; ver_maj = "4.10"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + outputs = [ "dev" "out" "docdev" ]; #TODO: gladeui # By default, libxfcegui4 tries to install into libglade's prefix. # Install into our own prefix instead. - preConfigure = - '' - configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" - ''; + configureFlags = [ + "--with-libglade-module-path=$(out)/lib/libglade/2.0" + ]; #NOTE: missing keyboard library support is OK according to the mailing-list buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification + libstartup_notification hicolor_icon_theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 1fc895ea412ab..132003d3fc920 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype, -libgsf, poppler, bzip2 }: - -stdenv.mkDerivation rec { +{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype +, libgsf, poppler, bzip2 }: +let p_name = "tumbler"; ver_maj = "0.1"; ver_min = "31"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype - poppler libgsf bzip2]; + outputs = [ "dev" "out" "docdev" ]; + + buildInputs = [ + pkgconfig intltool dbus_glib gdk_pixbuf curl freetype + poppler libgsf bzip2 + ]; configureFlags = [ # Needs gst-tag @@ -21,15 +26,16 @@ stdenv.mkDerivation rec { # Needs libffmpegthumbnailer # "--enable-ffmpeg-thumbnailer" - + "--enable-odf-thumbnailer" "--enable-poppler-thumbnailer" ]; - meta = { + meta = with stdenv.lib; { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index 25bd04f9ec400..d39708dd523fe 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -1,27 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util , libxfce4ui, garcon, xfconf }: - -stdenv.mkDerivation rec { +let p_name = "xfce4-appfinder"; ver_maj = "4.12"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index 5541011a50194..da7369decc46d 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }: - -stdenv.mkDerivation rec { +let p_name = "xfce4-dev-tools"; ver_maj = "4.12"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig glib ]; @@ -22,3 +23,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 0f9066876c66b..816bbc05735f2 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,49 +1,50 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer +, makeWrapper, xfce4mixer, hicolor_icon_theme , withGtk3 ? false, gtk3 }: - -with { inherit (stdenv.lib) optional; }; - -stdenv.mkDerivation rec { +let + inherit (stdenv.lib) optional; p_name = "xfce4-panel"; ver_maj = "4.12"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; patches = [ ./xfce4-panel-datadir.patch ]; patchFlags = "-p1"; - configureFlags = optional withGtk3 "--enable-gtk3"; + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification makeWrapper + garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme ] ++ xfce4mixer.gst_plugins ++ optional withGtk3 gtk3; propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ]; + configureFlags = optional withGtk3 "--enable-gtk3"; + postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 9a3116463c63c..7695f906d317d 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,29 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel }: - -stdenv.mkDerivation rec { +, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme }: +let p_name = "xfce4-power-manager"; ver_maj = "1.4"; ver_min = "4"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util - libnotify xfce4panel + libnotify xfce4panel hicolor_icon_theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { + meta = with stdenv.lib; { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 7599826e8f02b..a0568b0dd3954 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,25 +1,26 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg +, hicolor_icon_theme }: -#TODO: gnome stuff: gconf (assistive?), keyring - -stdenv.mkDerivation rec { +let p_name = "xfce4-session"; ver_maj = "4.12"; ver_min = "1"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib - xfconf xfce4panel libglade xorg.iceauth - polkit - ]; + xfconf xfce4panel libglade xorg.iceauth xorg.libSM + polkit hicolor_icon_theme + ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' sed '/^PATH=/d' -i scripts/xflock4 @@ -28,13 +29,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xsession-prefix=$(out)" ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 4c2de64561d5c..f6f7c4c3a54b2 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -1,33 +1,33 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui , libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: - -#TODO: optional packages -stdenv.mkDerivation rec { +let p_name = "xfce4-settings"; ver_maj = "4.12"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - patches = [ ./xfce4-settings-default-icon-theme.patch ]; buildInputs = [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - ]; + ]; #TODO: optional packages - configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; + configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index f12f96895cd92..13902fa4428c7 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -1,24 +1,28 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: - -stdenv.mkDerivation rec { +let p_name = "xfconf"; ver_maj = "4.12"; ver_min = "0"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + + outputs = [ "dev" "out" "docdev" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) buildInputs = [ pkgconfig intltool glib libxfce4util ]; propagatedBuildInputs = [ dbus_glib ]; - meta = { + meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } + diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index e5d04879008e7..8802862edddea 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,30 +1,32 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify }: - -stdenv.mkDerivation rec { +, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify +, hicolor_icon_theme }: +let p_name = "xfdesktop"; ver_maj = "4.12"; ver_min = "3"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify + libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index dd18b1355f798..d861e5f2d5570 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util , libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }: - -stdenv.mkDerivation rec { +let p_name = "xfwm4"; ver_maj = "4.12"; ver_min = "3"; +in +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf @@ -20,11 +21,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } + diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 7a960dc931b9b..37947c804b8b8 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { fi done - patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ libusb ]} \ + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ libusb ]} \ "$out/share/arduino/hardware/tools/avrdude" ''; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 0ab3f52f2bff5..f13826ddb8c03 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -65,6 +65,9 @@ let if [ -d "$out"/cuda-samples ]; then mv "$out"/cuda-samples "$out"/samples fi + + # Change the #error on GCC > 4.9 to a #warning. + sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' ''; meta = { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7fedbed282931..87211ff6e6ed0 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -50,7 +50,7 @@ let doCheck = false; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; postInstall = - let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ]; + let bins = lib.makeBinPath [ nodejs self.elm-make ]; in '' wrapProgram $out/bin/elm-repl \ --prefix PATH ':' ${bins} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index cc8c80653ba2a..99a4d6fc4d1fb 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.7.3"; - devver = "4_7_3"; + version = "4.8.5"; + devver = "4_8_5"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/gambc-v${devver}-devel.tgz"; - sha256 = "12jbr6bc0zmc7vw07a9pliadbvqgwkpmw6cj8awz73clv1j7pxha"; + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz"; + sha256 = "02b5bm06k2qr0lvdwwsl0ygxs7n8410rrkq95picn4s02kxszqnq"; }; configureFlags = [ "--enable-shared" "--enable-single-host" ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index b6f6ac51ba2a9..1c549907c31d3 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -1,4 +1,5 @@ -{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses }: +{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses +, dirName ? null, subdirName ? null }: with stdenv.lib; let versionParts = splitString "-" version; # 4.7 2013q3 20130916 @@ -8,13 +9,15 @@ let yearQuarterParts = splitString "q" yearQuarter; # 2013 3 year = elemAt yearQuarterParts 0; # 2013 quarter = elemAt yearQuarterParts 1; # 3 - subdirName = "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update + dirName_ = if dirName != null then dirName else majorVersion; + subdirName_ = if subdirName != null then subdirName + else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update in stdenv.mkDerivation { name = "gcc-arm-embedded-${version}"; src = fetchurl { - url = "https://launchpad.net/gcc-arm-embedded/${majorVersion}/${subdirName}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; + url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; sha256 = sha256; }; @@ -30,8 +33,8 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then - patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \ + patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ + --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \ "$f" || true fi done diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index af2e97b1e4e55..af36ec33b70a9 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -8,9 +8,10 @@ mkdir $NIX_FIXINC_DUMMY if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else - EXTRA_LDFLAGS="" + EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" fi + # GCC interprets empty paths as ".", which we don't want. if test -z "$CPATH"; then unset CPATH; fi if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi @@ -29,7 +30,7 @@ if test "$noSysDirs" = "1"; then # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$libc_dev/include # The path to the Glibc binaries such as `crti.o'. glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" @@ -50,10 +51,10 @@ if test "$noSysDirs" = "1"; then # bootstrap compiler are optimized and (optionally) contain # debugging information (info "(gccinstall) Building"). if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" + extraFlags="-O2 -g $extraFlags" else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" + # Don't pass `-g' at all; this saves space while building. + extraFlags="-O2 $extraFlags" fi EXTRA_FLAGS="$extraFlags" @@ -170,9 +171,8 @@ preConfigure() { # Patch the configure script so it finds glibc headers. It's # important for example in order not to get libssp built, # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ + -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \ gcc/configure fi @@ -206,6 +206,14 @@ preInstall() { postInstall() { + # Move runtime libraries to $lib. + mkdir -p $lib/lib + ln -s lib $lib/lib64 + mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/ + for i in $lib/lib/*.la; do + substituteInPlace $i --replace $out $lib + done + # Remove precompiled headers for now. They are very big and # probably not very useful yet. find $out/include -name "*.gch" -exec rm -rf {} \; -prune @@ -217,6 +225,7 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out for i in $out/libexec/gcc/*/*/*; do if PREV_RPATH=`patchelf --print-rpath $i`; then @@ -225,7 +234,7 @@ postInstall() { done # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux} # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. for i in $out/bin/*-gcc*; do diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d630754244380..bdffbc043d0f7 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -170,7 +170,7 @@ let version = "4.6.4"; "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; in @@ -182,15 +182,21 @@ stdenv.mkDerivation ({ builder = ./builder.sh; - src = (import ./sources.nix) { + srcs = (import ./sources.nix) { inherit fetchurl optional version; inherit langC langCC langFortran langJava langAda langGo; }; + outputs = [ "out" "lib" ]; + + setOutputFlags = false; + inherit patches enableMultilib; hardeningDisable = [ "format" ]; + libc_dev = stdenv.cc.libc_dev; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv' diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 649312b1c1b1f..823b104e6e415 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -197,7 +197,7 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; in @@ -209,8 +209,6 @@ stdenv.mkDerivation ({ builder = ../builder.sh; - outputs = [ "out" "info" ]; - src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; @@ -220,6 +218,12 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; + outputs = [ "out" "lib" "doc" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv' @@ -360,7 +364,7 @@ stdenv.mkDerivation ({ ) } ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc}/include" + then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 02d48bc76f192..736b4e59e6d88 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -73,7 +73,7 @@ let version = "4.9.3"; ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch # The NXConstStr.patch can be removed at 4.9.4 - ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch; + ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -199,7 +199,7 @@ let version = "4.9.3"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + bootstrap = cross == null; in @@ -211,8 +211,6 @@ stdenv.mkDerivation ({ builder = ../builder.sh; - outputs = [ "out" "info" ]; - src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"; @@ -222,6 +220,13 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; + outputs = if langJava || langGo then ["out" "man" "info"] + else [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv' @@ -313,7 +318,11 @@ stdenv.mkDerivation ({ FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ ) fi - ''; + '' + + stdenv.lib.optionalString (langJava || langGo) '' + export lib=$out; + '' + ; dontDisableStatic = true; @@ -362,7 +371,7 @@ stdenv.mkDerivation ({ ) } ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc}/include" + then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} @@ -536,4 +545,10 @@ stdenv.mkDerivation ({ // optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } + +// optionalAttrs (langJava) { + postFixup = '' + target="$(echo "$out/libexec/gcc"/*/*/ecj*)" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + '';} ) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1df60bb784064..f54ca3040421d 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -34,6 +34,7 @@ , stripped ? true , gnused ? null , binutils ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places }: assert langJava -> zip != null && unzip != null @@ -197,7 +198,7 @@ let version = "5.3.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + bootstrap = cross == null; in @@ -209,8 +210,6 @@ stdenv.mkDerivation ({ builder = ../builder.sh; - outputs = [ "out" "info" ]; - src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"; @@ -221,6 +220,12 @@ stdenv.mkDerivation ({ inherit patches; + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv' @@ -361,7 +366,7 @@ stdenv.mkDerivation ({ ) } ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc}/include" + then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 6d9e931387372..3190c5f5739f2 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -8,9 +8,10 @@ mkdir $NIX_FIXINC_DUMMY if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else - EXTRA_LDFLAGS="" + EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" fi + # GCC interprets empty paths as ".", which we don't want. if test -z "$CPATH"; then unset CPATH; fi if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi @@ -29,7 +30,7 @@ if test "$noSysDirs" = "1"; then # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$libc_dev/include # The path to the Glibc binaries such as `crti.o'. glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" @@ -171,9 +172,8 @@ preConfigure() { # Patch the configure script so it finds glibc headers. It's # important for example in order not to get libssp built, # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ + -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \ gcc/configure fi @@ -210,9 +210,15 @@ preInstall() { postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune + # Move runtime libraries to $lib. + moveToOutput "lib/lib*.so*" "$lib" + moveToOutput "lib/lib*.la" "$lib" + ln -s lib "$lib/lib64" # for *.la + moveToOutput "share/gcc-*/python" "$lib" + + for i in "$lib"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "$lib" + done # Remove `fixincl' to prevent a retained dependency on the # previous gcc. @@ -221,15 +227,23 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $out/libexec/gcc/*/*/*; do - if PREV_RPATH=`patchelf --print-rpath $i`; then - patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i - fi + for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do + PREV_RPATH=`patchelf --print-rpath "$i"` + NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` + patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK + done + + # For some reason the libs retain RPATH to $out + for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do + PREV_RPATH=`patchelf --print-rpath "$i"` + NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` + patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK done # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux} # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. for i in $out/bin/*-gcc*; do @@ -250,6 +264,9 @@ postInstall() { paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} eval "$postInstallGhdl" + + # Two identical man pages are shipped (moving and compressing is done later) + ln -sf gcc.1 "$out"/share/man/man1/g++.1 } genericBuild diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 96ec4e6c114a0..3ad872518f9e5 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -40,14 +40,14 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; + --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done '' else ""); configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include + ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include ''; # Stripping combined with patchelf breaks the executables (they die @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { (if stdenv.isDarwin then '' mkdir -p $out/frameworks/GMP.framework/Versions/A - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP - ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP + ln -s ${gmp.out}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP + ln -s ${gmp.out}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP # !!! fix this mkdir -p $out/frameworks/GNUeditline.framework/Versions/A ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { + '' # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way - sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf + sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp.out}/lib\",\2@" $out/lib/ghc-${version}/package.conf # Sanity check, can ghc create executables? cd $TMP diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index def807971c017..9a816797291bb 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ - "--with-gmp-libraries=${gmp}/lib" - "--with-gmp-includes=${gmp}/include" + "--with-gmp-libraries=${gmp.out}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gcc=${stdenv.cc}/bin/gcc" ]; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index e480a6f837c3d..5c33a193c5013 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ghc perl gmp ncurses]; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" ''; preConfigure = '' diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 31df7f1fa355b..c03cfbaaaddac 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; + --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 281e5ca66a2cd..9152210b420d5 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/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" diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 87490842b3b67..d7f1e064030b4 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -6,10 +6,10 @@ let inherit (bootPkgs) ghc; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/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" @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 53ba058def4d9..ce62a1277d364 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ docFixes - ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-7.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 7276f413967fa..a08745732f887 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/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" diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 03dd4dcd35bbf..cf21a61b1b39c 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib" - ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" + ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${gmp}/lib" {} \; + --set-rpath "$out/lib:${gmp.out}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index b2abcb08ec3a5..bf48e50b6b73e 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/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" diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 366c0044a67ad..af9fd3f8d93c0 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -22,10 +22,10 @@ in stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/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" diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index 2e0f5ba07e4d0..706899a8f7ba0 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 4323341dc4a49..cdcc2cf0e75eb 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 00482d013c23f..404e7e5cc28bf 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -7,16 +7,16 @@ let in stdenv.mkDerivation rec { - version = "8.0.0.20160204"; + version = "8.0.0.20160411"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1-rc2/${name}-src.tar.xz"; - sha256 = "0v8pciva93i4a6h0l76vq6bbvrg76b1y4awwbxcg3m9gnqkvmy2k"; + url = "https://downloads.haskell.org/~ghc/8.0.1-rc3/${name}-src.tar.xz"; + sha256 = "0cgk0li3pwag65xcrjci8l840aphklymjfmsrq0qpdi8bpsmi97d"; }; patches = [ - ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; buildInputs = [ ghc perl hscolour ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch index 129a34ecd86e2..129a34ecd86e2 100644 --- a/pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch +++ b/pkgs/development/compilers/ghc/ghc-7.x-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 0000000000000..34e098c8f1eef --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-8.x-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,23 @@ +diff -ubr ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs +--- ghc-8.0.0.20160411-orig/compiler/main/SysTools.hs 2016-04-12 10:50:46.533389045 +0200 ++++ ghc-8.0.0.20160411-patched/compiler/main/SysTools.hs 2016-04-12 10:53:29.973933760 +0200 +@@ -414,7 +414,7 @@ + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -936,7 +936,7 @@ + args2 = args0 ++ linkargs ++ args1 ++ args + args3 = argFixup args2 [] + mb_env <- getGccEnv args3 +- runSomethingResponseFile dflags ld_filter "Linker" p args3 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args3 mb_env + where + testLib lib = "-l" `isPrefixOf` lib || ".a" `isSuffixOf` lib + {- GHC is just blindly appending linker arguments from libraries and +Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.orig +Only in ghc-8.0.0.20160411-patched/compiler/main: SysTools.hs.rej diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 18e22f0100be9..00de233c0ec29 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; patches = [ - ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ./ghc-7.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; postUnpack = '' @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index acaef9c5ab11f..ca0a78eb0b677 100644 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ b/pkgs/development/compilers/ghc/nokinds.nix @@ -4,10 +4,10 @@ let inherit (bootPkgs) ghc; 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" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" DYNAMIC_BY_DEFAULT = NO SRC_HC_OPTS = -H64m -O -fasm GhcLibHcOpts = -O -dcore-lint @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 77b3a15cb32ff..929d59a9a9bc6 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -40,8 +40,8 @@ , ghcjsBootSrc ? fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f"; - sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j"; + rev = "758e79e420403e0f6625eda19b10c46564f7cbb5"; + sha256 = "0gq1mc86cb2z875a7sdj44yy8g95rwxzkl3z1q8gg33k05s3b58r"; fetchSubmodules = true; } , ghcjsBoot ? import ./ghcjs-boot.nix { @@ -60,8 +60,8 @@ in mkDerivation (rec { src = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; - rev = "13a99c6da40e3700e070e430d4c0f2ea96217b24"; - sha256 = "01yg6babmhn2bfbmgkddisfj9ai7fc4r08s6acd49s9amcw7g5ld"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; }; isLibrary = true; isExecutable = true; @@ -117,13 +117,13 @@ in mkDerivation (rec { # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw postInstall = '' - PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ --dev \ --quick \ --with-cabal ${cabal-install}/bin/cabal \ - --with-gmp-includes ${gmp}/include \ - --with-gmp-libraries ${gmp}/lib + --with-gmp-includes ${gmp.dev}/include \ + --with-gmp-libraries ${gmp.out}/lib ''; passthru = let ghcjsNodePkgs = pkgs.nodePackages.override { diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix index 2d68ea0755151..0da50570bf593 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "4df1808d03117ddcd45f276f0ddd85c73e59506a"; - sha256 = "0nay4pmq3yqqvpz23709i3729840idpcc2ii2jd0xvaj1z61adda"; + rev = "dc034a035aa73db2c5be34145732090bd74c1b57"; + sha256 = "18r8kf7g7d2n0rhwcgiz9gsgdmgln1nmwwyj347bpn4zh17qlkqa"; } diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix new file mode 100644 index 0000000000000..0c6d412641491 --- /dev/null +++ b/pkgs/development/compilers/go/1.1.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc +, removeGodocExternals ? false }: + +let + loader386 = "${glibc.out}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc.out}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.1.2"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.1.2.src.tar.gz; + sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go + '' + stdenv.lib.optionalString removeGodocExternals '' + sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html + ''; + + patches = [ ./cacert.patch ]; + + GOOS = "linux"; + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go \ + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} + done + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + branch = "1.1"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix new file mode 100644 index 0000000000000..0454ea96d892e --- /dev/null +++ b/pkgs/development/compilers/go/1.2.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: + +let + loader386 = "${glibc.out}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc.out}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.2.2"; + + src = fetchurl { + url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz; + sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = "linux"; + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + branch = "1.2"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix new file mode 100644 index 0000000000000..a9a3c10584b08 --- /dev/null +++ b/pkgs/development/compilers/go/1.3.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }: + +let + loader386 = "${glibc.out}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc.out}/lib/ld-linux.so.3"; + srcs = { + golang = fetchurl { + url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz; + sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a"; + }; + tools = fetchhg { + url = https://code.google.com/p/go.tools/; + rev = "e1c276c4e679"; + sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76"; + }; + }; +in + +stdenv.mkDerivation { + name = "go-1.3.3"; + + src = srcs.golang; + + # perl is used for testing go vet + buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + postUnpack = '' + mkdir -p $out/share/go/src/pkg/code.google.com/p/ + cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools + ''; + + prePatch = '' + # Ensure that the source directory is named go + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go + '' + lib.optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = if stdenv.isDarwin then 0 else 1; + + installPhase = '' + export CC=cc + mkdir -p "$out/bin" + unset GOPATH + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Build extra tooling + # TODO: Fix godoc tests + TOOL_ROOT=code.google.com/p/go.tools/cmd + go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc + go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + setupHook = ./setup-hook.sh; + + meta = { + branch = "1.3"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 434611b23e2c4..3161b9f70b7a0 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go # Find the loader dynamically - LOADER="$(find ${libc}/lib -name ld-linux\* | head -n 1)" + LOADER="$(find ${libc.out or libc}/lib -name ld-linux\* | head -n 1)" # Replace references to the loader find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix new file mode 100644 index 0000000000000..c684d7d5ee5db --- /dev/null +++ b/pkgs/development/compilers/go/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: + +let + loader386 = "${glibc.out}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc.out}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.0.3"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.0.3.src.tar.gz; + sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + ''; + + patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ]; + + GOOS = "linux"; + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go \ + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} + done + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + branch = "1.0"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 0c0520533bcd2..9886dc4d52ad0 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeSearchPath "lib" [ + LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 suitesparse ]; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 49c26592f2e83..2fbe50fbc9f1e 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeSearchPath "lib" [ + LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 suitesparse ]; diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 393e889024bed..be527d873754a 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -56,6 +56,8 @@ in stdenv.mkDerivation rec { "-DCAN_TARGET_i386=false" ]; + NIX_LDFLAGS = "-lpthread"; # no idea what's the problem + postBuild = '' rm -fR $out diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 7ff013b234410..74905c6ffae41 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -34,7 +34,7 @@ let # GDB needs ncurses case "$file" in - *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";; + *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";; esac done diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 4299b50ea6da7..1678a6e509158 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ - "GMP_CFLAGS=-I${gmp}/include" - "GMP_LDFLAGS=-L${gmp}/lib" + "GMP_CFLAGS=-I${gmp.dev}/include" + "GMP_LDFLAGS=-L${gmp.out}/lib" ]; postInstall = '' diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 381941acc20e5..c4890c1ca886e 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -6,8 +6,8 @@ let usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; dynamic_linker = - if stdenv.isx86_64 then "${stdenv.glibc}/lib/ld-linux-x86-64.so.2" - else "${stdenv.glibc}/lib/ld-linux.so.2"; + if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" + else "${stdenv.glibc.out}/lib/ld-linux.so.2"; in stdenv.mkDerivation rec { @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { chmod u+x $(pwd)/../${usr_prefix}/bin/mlton # So the builder runs the binary compiler with gmp. - export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH '' + stdenv.lib.optionalString stdenv.isLinux '' # Patch ELF interpreter. @@ -92,10 +92,10 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton # Path to libgmp. - substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'" + substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'" # Path to gmp.h. - substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'" + substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'" # Path to the same cc used in the build; needed at runtime. substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'" diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index a4dbfeac8342a..f81370992a65a 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "sh build.sh"; installPhase = '' - installBin bin/nim + install -Dt "$out/bin" bin/nim substituteInPlace install.sh --replace '$1/nim' "$out" sh install.sh $out ''; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 9c6d07c4681e9..ab71090b35802 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' for b in cgc cgfxcat cginfo do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b" + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux*.so.? "bin/$b" done # FIXME: cgfxcat and cginfo need more patchelf mkdir -p "$out/bin/" diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 4d18b8d328d60..492b1c4b33381 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation { interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" - patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done for a in "$out"/lib/*.so; do - patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 97ffbf9f0993e..de803a5d90c51 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -106,9 +106,9 @@ let makeFlags = [ "SORT=${coreutils}/bin/sort" - "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" - "FREETYPE_HEADERS_PATH=${freetype}/include" - "FREETYPE_LIB_PATH=${freetype}/lib" + "ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" + "FREETYPE_HEADERS_PATH=${freetype.dev}/include" + "FREETYPE_LIB_PATH=${freetype.out}/lib" "MILESTONE=${update}" "BUILD_NUMBER=b${build}" "USRBIN_PATH=" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 45bef9819aabf..7ba6b56a8f38c 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype +{ stdenv, fetchurl, cpio, pkgconfig, file, which, unzip, zip, xorg, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib , setJavaClassPath , minimal ? false @@ -63,6 +63,7 @@ let outputs = [ "out" "jre" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cpio file which unzip zip xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst @@ -93,7 +94,6 @@ let ''; configureFlags = [ - "--with-freetype=${freetype}" "--with-boot-jdk=${bootjdk.home}" "--with-update-version=${update}" "--with-build-number=${build}" diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index a9ca7673dfe99..48a22638813f7 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -40,13 +40,13 @@ let LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" for i in $out/bin/*; do - patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true - patchelf --set-rpath "${glibc}/lib:$LIBDIRS" $i || true + patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i || true + patchelf --set-rpath "${glibc.out}/lib:$LIBDIRS" $i || true done find $out -name \*.so\* | while read lib; do - patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $lib || true - patchelf --set-rpath "${glibc}/lib:${stdenv.cc.cc}/lib:$LIBDIRS" $lib || true + patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true + patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index d60ad0d11ec94..1488736a48087 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -8,20 +8,25 @@ stdenv.mkDerivation rec { sha256 = "16ykgdrgxr6pfpy931p979cs68klvwmk3ii1k0a00wr4nn9x931k"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; # compilation tools + + postInstall = '' + sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc + ''; # building memcpy_speed.log # ../test-driver: line 107: 4495 Segmentation fault "$@" > $log_file 2>&1 # FAIL: memcpy_speed doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7 - meta = { + meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; homepage = "http://code.entropywave.com/orc/"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.fuuzetsu ]; }; } diff --git a/pkgs/development/compilers/path64/default.nix b/pkgs/development/compilers/path64/default.nix index d6112dcdfc482..694bdc8990fd7 100644 --- a/pkgs/development/compilers/path64/default.nix +++ b/pkgs/development/compilers/path64/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patchPhase = '' sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c - sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in + sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in ''; cmakeFlags = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { -DPATH64_ENABLE_PSCRUNTIME=OFF -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF - -DPSC_CRT_PATH=${stdenv.cc.libc}/lib + -DPSC_CRT_PATH=${stdenv.cc.libc.out}/lib ''; makeFlags = "-j4"; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c94ba203c0ff9..076146095196a 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { checkTarget = "test"; patchPhase = '' - sed 's|/usr/lib/x86_64-linux-gnu/|${glibc}/lib/|g' -i src/libponyc/codegen/genexe.c + sed 's|/usr/lib/x86_64-linux-gnu/|${glibc.out}/lib/|g' -i src/libponyc/codegen/genexe.c sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc}/lib/|g' -i src/libponyc/codegen/genexe.c ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; preCheck = '' - export LIBRARY_PATH="$out/lib:${openssl}/lib:${pcre2}/lib" + export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib" ''; installPhase = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation { mv $out/bin/ponyc $out/bin/ponyc.wrapped makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \ --prefix LIBRARY_PATH : "$out/lib" \ - --prefix LIBRARY_PATH : "${openssl}/lib" \ + --prefix LIBRARY_PATH : "${openssl.out}/lib" \ --prefix LIBRARY_PATH : "${pcre2}/lib" ''; diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index c0f15fbd116c5..734e43f502b23 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps -, llvmPackages_37, jemalloc, ncurses, darwin +, llvmPackages_37, jemalloc, ncurses, darwin, binutils , shortVersion, isRelease , forceBundledLLVM ? false @@ -114,8 +114,8 @@ with stdenv.lib; stdenv.mkDerivation { mkdir -p "$out" cp -r bin "$out/bin" '' + optionalString stdenv.isLinux '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ + patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \ "$out/bin/rustc" ''; }; @@ -123,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" - ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] + ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; @@ -169,6 +169,7 @@ with stdenv.lib; stdenv.mkDerivation { enableParallelBuilding = false; # missing files during linking, occasionally outputs = [ "out" "doc" ]; + setOutputFlags = false; preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 96844b2b1f193..40e4d49d51e81 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") - configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib") - configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include") - configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib") + configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib") + configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include") + configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib") ''; doCheck = true; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f99571c6a10bb..5fbfd8a96ac9b 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; - export SQHEADER="${sqlite}/include/sqlite3.h"; + export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CCARGS="-I$out/include \ -L${mysql.lib}/lib/mysql \ - -L${postgresql}/lib \ - -L${sqlite}/lib"; + -L${postgresql.lib}/lib \ + -L${sqlite.out}/lib"; ''; # Be sure to keep the statically linked libraries diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 2eeb6b207b10f..d35c062d6e4e2 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchFromGitHub, coq }: let param = - if coq.coq-version == "8.4" - then { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; } - else { version = "0.9.0-beta3"; sha256 = "1dya0sqp5jjb2cl7cv2ry4gvcr359bkzzqcz0plknf3f1c5zrv0s"; }; + { + "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; }; + "8.5" = { version = "0.9.3"; sha256 = "05zff5mrkxpvcsw4gi8whjj5w0mdbqzjmb247lq5b7mry0bypwc5"; }; + }."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 93b09acbda1b5..89258062f263e 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -106,7 +106,7 @@ go.stdenv.mkDerivation ( echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" else pushd go/src >/dev/null - find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | sort | uniq + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq popd >/dev/null fi } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 894883a26c91d..16944c2d5a3bd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -157,7 +157,6 @@ self: super: { gl = dontHaddock super.gl; groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; - haste-compiler = dontHaddock super.haste-compiler; HaXml = dontHaddock super.HaXml; HDBC-odbc = dontHaddock super.HDBC-odbc; hoodle-core = dontHaddock super.hoodle-core; @@ -224,8 +223,8 @@ self: super: { else super.x509-system; double-conversion = if !pkgs.stdenv.isDarwin - then super.double-conversion - else addBuildDepend (overrideCabal super.double-conversion (drv: + then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib + else addExtraLibrary (overrideCabal super.double-conversion (drv: { postPatch = '' substituteInPlace double-conversion.cabal --replace stdc++ c++ @@ -366,7 +365,6 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; @@ -971,4 +969,58 @@ self: super: { # https://github.com/danidiaz/pipes-transduce/issues/2 pipes-transduce = super.pipes-transduce.override { foldl = self.foldl_1_1_6; }; + # Haste stuff + haste-Cabal = self.callPackage ../tools/haskell/haste/haste-Cabal.nix {}; + haste-cabal-install = self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; HTTP = self.HTTP_4000_2_23; }; + haste-compiler = self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; }; + + # Ensure the necessary frameworks are propagatedBuildInputs on darwin + OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; + preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) + frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") + configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) + ''; + }); + GLURaw = overrideCabal super.GLURaw (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; + }); + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + doCheck = false; # requires an active X11 display + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + (with pkgs.darwin.apple_sdk.frameworks; + [ AGL Cocoa OpenGL IOKit Kernel CoreVideo + pkgs.darwin.CF ]); + }); + OpenCL = overrideCabal super.OpenCL (drv: { + librarySystemDepends = + pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; + libraryHaskellDepends = drv.libraryHaskellDepends + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin + [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; + }); + + # Tests must be disabled on darwin for all versions of c2hs + # (e.g. Stackage LTS releases). + c2hs_0_20_1 = if pkgs.stdenv.isDarwin + then dontCheck super.c2hs_0_20_1 + else super.c2hs_0_20_1; + c2hs_0_25_2 = if pkgs.stdenv.isDarwin + then dontCheck super.c2hs_0_25_2 + else super.c2hs_0_25_2; + c2hs_0_27_1 = if pkgs.stdenv.isDarwin + then dontCheck super.c2hs_0_27_1 + else super.c2hs_0_27_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 2e013ee940a24..5550016b9b5c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -59,4 +59,22 @@ self: super: { comonad_5 = dontCheck super.comonad_5; # https://github.com/ekmett/comonad/issues/33 comonad = self.comonad_5; + # Versions <= 5.2 don't compile with transformers 0.5 or later. + bifunctors = self.bifunctors_5_3; + + # https://github.com/ekmett/semigroupoids/issues/42 + semigroupoids = dontCheck super.semigroupoids; + + # Version 4.x doesn't compile with transformers 0.5 or later. + kan-extensions = self.kan-extensions_5_0_1; + + # Earlier versions don't support kan-extensions 5.x. + lens = self.lens_4_13_2_1; + + # https://github.com/dreixel/generic-deriving/issues/37 + generic-deriving = dontHaddock super.generic-deriving; + + # https://github.com/haskell-suite/haskell-src-exts/issues/302 + haskell-src-exts = dontCheck super.haskell-src-exts; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1c0536b67e670..2eb897d799c37 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -111,6 +111,7 @@ dont-distribute-packages: dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ] hfsevents: [ i686-linux, x86_64-linux ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -304,6 +305,7 @@ dont-distribute-packages: audiovisual: [ i686-linux, x86_64-darwin, x86_64-linux ] augeas: [ i686-linux, x86_64-darwin, x86_64-linux ] augur: [ i686-linux, x86_64-darwin, x86_64-linux ] + aur: [ i686-linux, x86_64-darwin, x86_64-linux ] Aurochs: [ i686-linux, x86_64-darwin, x86_64-linux ] authoring: [ i686-linux, x86_64-darwin, x86_64-linux ] AutoForms: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -530,6 +532,7 @@ dont-distribute-packages: cabal-upload: [ i686-linux, x86_64-darwin, x86_64-linux ] cabal2arch: [ i686-linux, x86_64-darwin, x86_64-linux ] cabal2doap: [ i686-linux, x86_64-darwin, x86_64-linux ] + cabal2ghci: [ i686-linux, x86_64-darwin, x86_64-linux ] cabal2spec: [ i686-linux, x86_64-darwin, x86_64-linux ] cabalgraph: [ i686-linux, x86_64-darwin, x86_64-linux ] cabalmdvrpm: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -772,6 +775,7 @@ dont-distribute-packages: craftwerk: [ i686-linux, x86_64-darwin, x86_64-linux ] craze: [ i686-linux, x86_64-darwin, x86_64-linux ] crc16: [ i686-linux, x86_64-darwin, x86_64-linux ] + crc: [ i686-linux, x86_64-darwin, x86_64-linux ] crf-chain1-constrained: [ i686-linux, x86_64-darwin, x86_64-linux ] crf-chain1: [ i686-linux, x86_64-darwin, x86_64-linux ] crf-chain2-generic: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -952,6 +956,7 @@ dont-distribute-packages: distributed-process-zookeeper: [ i686-linux, x86_64-darwin, x86_64-linux ] distribution-plot: [ i686-linux, x86_64-darwin, x86_64-linux ] distribution: [ i686-linux, x86_64-darwin, x86_64-linux ] + dixi: [ i686-linux, x86_64-darwin, x86_64-linux ] djembe: [ x86_64-darwin ] djinn-th: [ i686-linux, x86_64-darwin, x86_64-linux ] DnaProteinAlignment: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -987,6 +992,7 @@ dont-distribute-packages: dropsolve: [ i686-linux, x86_64-darwin, x86_64-linux ] ds-kanren: [ i686-linux, x86_64-darwin, x86_64-linux ] dsh-sql: [ i686-linux, x86_64-darwin, x86_64-linux ] + DSH: [ i686-linux, x86_64-darwin, x86_64-linux ] dsmc-tools: [ i686-linux, x86_64-darwin, x86_64-linux ] dsmc: [ i686-linux, x86_64-darwin, x86_64-linux ] DSTM: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1218,7 +1224,7 @@ dont-distribute-packages: free-theorems: [ i686-linux, x86_64-darwin, x86_64-linux ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freenect: [ x86_64-darwin ] - freer: [ i686-linux ] + freer: [ i686-linux, x86_64-darwin, x86_64-linux ] freesect: [ i686-linux, x86_64-darwin, x86_64-linux ] freesound: [ i686-linux, x86_64-darwin, x86_64-linux ] FreeTypeGL: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1334,6 +1340,7 @@ dont-distribute-packages: git-date: [ i686-linux, x86_64-darwin, x86_64-linux ] git-gpush: [ i686-linux, x86_64-darwin, x86_64-linux ] git-repair: [ i686-linux, x86_64-darwin, x86_64-linux ] + git-vogue: [ i686-linux, x86_64-darwin, x86_64-linux ] gitdo: [ i686-linux, x86_64-darwin, x86_64-linux ] github-backup: [ i686-linux, x86_64-darwin, x86_64-linux ] github-utils: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2132,6 +2139,7 @@ dont-distribute-packages: igraph: [ i686-linux, x86_64-darwin, x86_64-linux ] ihaskell-diagrams: [ x86_64-darwin ] ihaskell-inline-r: [ i686-linux, x86_64-darwin, x86_64-linux ] + ihaskell-parsec: [ i686-linux, x86_64-darwin, x86_64-linux ] ihaskell-plot: [ x86_64-darwin ] ihaskell-widgets: [ i686-linux, x86_64-darwin, x86_64-linux ] ihttp: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2176,6 +2184,7 @@ dont-distribute-packages: internetmarke: [ i686-linux, x86_64-darwin, x86_64-linux ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-darwin, x86_64-linux ] interpolatedstring-qq: [ i686-linux, x86_64-darwin, x86_64-linux ] + interruptible: [ i686-linux, x86_64-darwin, x86_64-linux ] intricacy: [ x86_64-darwin ] intset: [ i686-linux, x86_64-darwin, x86_64-linux ] io-reactive: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2345,6 +2354,7 @@ dont-distribute-packages: language-boogie: [ i686-linux, x86_64-darwin, x86_64-linux ] language-c-comments: [ i686-linux, x86_64-darwin, x86_64-linux ] language-c-inline: [ i686-linux, x86_64-darwin, x86_64-linux ] + language-c-quote: [ i686-linux, x86_64-darwin, x86_64-linux ] language-eiffel: [ i686-linux, x86_64-darwin, x86_64-linux ] language-go: [ i686-linux, x86_64-darwin, x86_64-linux ] language-java-classfile: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2508,6 +2518,7 @@ dont-distribute-packages: lye: [ i686-linux, x86_64-darwin, x86_64-linux ] lzma-streams: [ i686-linux ] lzma: [ i686-linux ] + macbeth-lib: [ i686-linux, x86_64-darwin, x86_64-linux ] mage: [ i686-linux, x86_64-darwin, x86_64-linux ] MagicHaskeller: [ i686-linux, x86_64-darwin, x86_64-linux ] magico: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2533,6 +2544,7 @@ dont-distribute-packages: manatee-welcome: [ i686-linux, x86_64-darwin, x86_64-linux ] manatee: [ i686-linux, x86_64-darwin, x86_64-linux ] mandulia: [ i686-linux, x86_64-darwin, x86_64-linux ] + mangopay: [ i686-linux, x86_64-darwin, x86_64-linux ] manifold-random: [ i686-linux, x86_64-darwin, x86_64-linux ] manifolds: [ i686-linux, x86_64-darwin, x86_64-linux ] mappy: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2643,6 +2655,7 @@ dont-distribute-packages: Monaris: [ i686-linux, x86_64-darwin, x86_64-linux ] Monatron-IO: [ i686-linux, x86_64-darwin, x86_64-linux ] Monatron: [ i686-linux, x86_64-darwin, x86_64-linux ] + mondo: [ i686-linux, x86_64-darwin, x86_64-linux ] mongodb-queue: [ i686-linux, x86_64-darwin, x86_64-linux ] mongrel2-handler: [ i686-linux, x86_64-darwin, x86_64-linux ] monitor: [ x86_64-darwin ] @@ -2684,6 +2697,7 @@ dont-distribute-packages: multirec-binary: [ i686-linux, x86_64-darwin, x86_64-linux ] multisetrewrite: [ i686-linux, x86_64-darwin, x86_64-linux ] murder: [ i686-linux, x86_64-darwin, x86_64-linux ] + murmur: [ i686-linux, x86_64-darwin, x86_64-linux ] murmurhash3: [ i686-linux, x86_64-darwin, x86_64-linux ] music-graphics: [ i686-linux, x86_64-darwin, x86_64-linux ] music-parts: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2922,6 +2936,7 @@ dont-distribute-packages: persistent-hssqlppp: [ i686-linux, x86_64-darwin, x86_64-linux ] persistent-map: [ i686-linux, x86_64-darwin, x86_64-linux ] persistent-protobuf: [ i686-linux, x86_64-darwin, x86_64-linux ] + persona-idp: [ i686-linux, x86_64-darwin, x86_64-linux ] pesca: [ i686-linux, x86_64-darwin, x86_64-linux ] peyotls-codec: [ i686-linux, x86_64-darwin, x86_64-linux ] peyotls: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3104,6 +3119,7 @@ dont-distribute-packages: QuickCheck-GenT: [ i686-linux, x86_64-darwin, x86_64-linux ] quickcheck-poly: [ i686-linux, x86_64-darwin, x86_64-linux ] quickcheck-rematch: [ i686-linux, x86_64-darwin, x86_64-linux ] + QuickPlot: [ i686-linux, x86_64-darwin, x86_64-linux ] quickpull: [ i686-linux, x86_64-darwin, x86_64-linux ] quickset: [ i686-linux, x86_64-darwin, x86_64-linux ] Quickson: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3320,6 +3336,7 @@ dont-distribute-packages: scotty-blaze: [ i686-linux, x86_64-darwin, x86_64-linux ] scotty-fay: [ i686-linux, x86_64-darwin, x86_64-linux ] scotty-hastache: [ i686-linux, x86_64-darwin, x86_64-linux ] + scotty-resource: [ i686-linux, x86_64-darwin, x86_64-linux ] scotty-session: [ i686-linux, x86_64-darwin, x86_64-linux ] scrabble-bot: [ i686-linux, x86_64-darwin, x86_64-linux ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3603,7 +3620,7 @@ dont-distribute-packages: symengine-hs: [ i686-linux, x86_64-darwin, x86_64-linux ] sync-mht: [ i686-linux ] sync: [ i686-linux, x86_64-darwin, x86_64-linux ] - syncthing-hs: [ x86_64-darwin ] + syncthing-hs: [ i686-linux, x86_64-darwin, x86_64-linux ] syntactic: [ i686-linux, x86_64-darwin ] syntax-attoparsec: [ i686-linux, x86_64-darwin, x86_64-linux ] syntax-example-json: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -4103,9 +4120,11 @@ dont-distribute-packages: yesod-examples: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-goodies: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-links: [ i686-linux, x86_64-darwin, x86_64-linux ] + yesod-mangopay: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-media-simple: [ x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-pagination: [ i686-linux, x86_64-darwin, x86_64-linux ] + yesod-pnotify: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-pure: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-purescript: [ i686-linux, x86_64-darwin, x86_64-linux ] yesod-raml-bin: [ i686-linux, x86_64-darwin, x86_64-linux ] diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 76ae38156f3fb..0255bb3f2f865 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2738,6 +2742,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3556,6 +3561,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3626,6 +3632,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3791,6 +3798,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3894,6 +3902,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4428,6 +4437,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4795,6 +4805,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4819,6 +4830,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4875,6 +4887,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5078,6 +5091,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5362,6 +5377,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5434,6 +5450,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5899,6 +5916,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5928,6 +5946,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6129,6 +6148,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6896,6 +6916,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6966,6 +6987,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6994,7 +7016,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7074,6 +7098,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7381,6 +7406,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8211,6 +8237,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8455,6 +8482,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8621,6 +8649,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8648,6 +8677,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index af27bea6a66cb..7a6b8d9c3975e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2738,6 +2742,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3556,6 +3561,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3626,6 +3632,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3791,6 +3798,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3894,6 +3902,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4428,6 +4437,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4795,6 +4805,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4819,6 +4830,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4875,6 +4887,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5078,6 +5091,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5362,6 +5377,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5434,6 +5450,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5899,6 +5916,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5928,6 +5946,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6129,6 +6148,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6896,6 +6916,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6966,6 +6987,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6994,7 +7016,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7074,6 +7098,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7381,6 +7406,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8211,6 +8237,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8455,6 +8482,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8621,6 +8649,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8648,6 +8677,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index e91ec4ef1efd7..564778ac7d1e4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2738,6 +2742,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3556,6 +3561,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3626,6 +3632,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3791,6 +3798,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3894,6 +3902,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4428,6 +4437,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4795,6 +4805,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4819,6 +4830,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4875,6 +4887,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5078,6 +5091,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5362,6 +5377,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5434,6 +5450,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5899,6 +5916,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5928,6 +5946,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6129,6 +6148,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6896,6 +6916,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6966,6 +6987,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6994,7 +7016,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7074,6 +7098,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7381,6 +7406,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8211,6 +8237,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8455,6 +8482,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8621,6 +8649,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8648,6 +8677,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 4ba0dc18bc6eb..c99f5b114ee2a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2738,6 +2742,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3556,6 +3561,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3626,6 +3632,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3791,6 +3798,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3894,6 +3902,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4428,6 +4437,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4795,6 +4805,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4819,6 +4830,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4875,6 +4887,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5078,6 +5091,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5362,6 +5377,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5434,6 +5450,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5899,6 +5916,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5928,6 +5946,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6129,6 +6148,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6896,6 +6916,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6966,6 +6987,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6994,7 +7016,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7074,6 +7098,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7381,6 +7406,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8211,6 +8237,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8455,6 +8482,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8621,6 +8649,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8648,6 +8677,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index b4e24ace05cfc..8519ea145d0a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2737,6 +2741,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3555,6 +3560,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3625,6 +3631,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3790,6 +3797,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3891,6 +3899,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4425,6 +4434,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4792,6 +4802,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4816,6 +4827,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4872,6 +4884,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5075,6 +5088,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5359,6 +5374,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5431,6 +5447,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5896,6 +5913,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5925,6 +5943,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6126,6 +6145,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6893,6 +6913,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6963,6 +6984,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6991,7 +7013,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7071,6 +7095,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7377,6 +7402,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8207,6 +8233,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8451,6 +8478,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8617,6 +8645,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8644,6 +8673,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 3a57c2b731b80..aa8bcf7c0f13d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1508,6 +1509,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2441,6 +2444,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2737,6 +2741,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3555,6 +3560,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3625,6 +3631,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_1"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3790,6 +3797,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3891,6 +3899,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4425,6 +4434,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4792,6 +4802,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4816,6 +4827,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4872,6 +4884,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5075,6 +5088,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5359,6 +5374,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5431,6 +5447,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5896,6 +5913,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5925,6 +5943,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6126,6 +6145,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6893,6 +6913,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6963,6 +6984,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6991,7 +7013,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7071,6 +7095,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7377,6 +7402,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8207,6 +8233,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8451,6 +8478,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8617,6 +8645,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8644,6 +8673,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 1bb176c3c12ed..70f9e6ec9a877 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1507,6 +1508,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2440,6 +2443,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2736,6 +2740,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3554,6 +3559,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3624,6 +3630,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_2"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3789,6 +3796,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3890,6 +3898,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4423,6 +4432,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4790,6 +4800,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4814,6 +4825,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4870,6 +4882,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5073,6 +5086,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5357,6 +5372,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5429,6 +5445,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5894,6 +5911,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5923,6 +5941,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6124,6 +6143,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6891,6 +6911,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6961,6 +6982,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6989,7 +7011,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7069,6 +7093,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7374,6 +7399,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8204,6 +8230,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8448,6 +8475,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8614,6 +8642,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8641,6 +8670,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 10bf8a3834df3..663960a8d01cd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1507,6 +1508,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2440,6 +2443,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2736,6 +2740,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3554,6 +3559,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3624,6 +3630,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_2"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3789,6 +3796,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3890,6 +3898,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4423,6 +4432,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4790,6 +4800,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4814,6 +4825,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4870,6 +4882,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5073,6 +5086,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5357,6 +5372,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5429,6 +5445,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5894,6 +5911,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5923,6 +5941,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_5_0_1"; @@ -6124,6 +6143,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6891,6 +6911,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6961,6 +6982,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6989,7 +7011,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7069,6 +7093,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7374,6 +7399,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8204,6 +8230,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8448,6 +8475,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8614,6 +8642,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8641,6 +8670,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 6612f19fdf5e2..11a254ac8e4b1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1504,6 +1505,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2433,6 +2436,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2729,6 +2733,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3546,6 +3551,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3615,6 +3621,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_2"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3780,6 +3787,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3881,6 +3889,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4415,6 +4424,7 @@ self: super: { "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; "hit" = doDistribute super."hit_0_6_2"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4781,6 +4791,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4805,6 +4816,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4861,6 +4873,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5064,6 +5077,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5348,6 +5363,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5420,6 +5436,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5885,6 +5902,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5914,6 +5932,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6115,6 +6134,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6882,6 +6902,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6952,6 +6973,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6980,7 +7002,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7060,6 +7084,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7364,6 +7389,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8193,6 +8219,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8437,6 +8464,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8602,6 +8630,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8629,6 +8658,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index a0e29bada3d89..b320d53dee1b6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1504,6 +1505,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2431,6 +2434,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2727,6 +2731,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3543,6 +3548,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3612,6 +3618,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3777,6 +3784,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3878,6 +3886,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4409,6 +4418,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4775,6 +4785,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4799,6 +4810,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4855,6 +4867,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5058,6 +5071,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5342,6 +5357,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5414,6 +5430,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5878,6 +5895,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5907,6 +5925,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6108,6 +6127,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6875,6 +6895,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6945,6 +6966,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6973,7 +6995,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7053,6 +7077,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7357,6 +7382,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8184,6 +8210,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8425,6 +8452,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8590,6 +8618,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8617,6 +8646,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index da5284cd71b3f..90a8e2daf9b5c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3534,6 +3539,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3603,6 +3609,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3768,6 +3775,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3868,6 +3876,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4398,6 +4407,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4764,6 +4774,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4788,6 +4799,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4844,6 +4856,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5042,6 +5055,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5326,6 +5341,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5398,6 +5414,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5861,6 +5878,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5890,6 +5908,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6090,6 +6109,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6855,6 +6875,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6925,6 +6946,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6953,7 +6975,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7032,6 +7056,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7336,6 +7361,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8159,6 +8185,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8398,6 +8425,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8563,6 +8591,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8590,6 +8619,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index fce3ad89e8142..e4b68356bb8ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3533,6 +3538,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3602,6 +3608,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3767,6 +3774,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3867,6 +3875,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4397,6 +4406,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4763,6 +4773,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4787,6 +4798,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4843,6 +4855,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5039,6 +5052,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5323,6 +5338,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5395,6 +5411,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5857,6 +5874,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5886,6 +5904,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6086,6 +6105,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6851,6 +6871,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6921,6 +6942,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6949,7 +6971,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7028,6 +7052,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7332,6 +7357,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8155,6 +8181,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8394,6 +8421,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8559,6 +8587,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8586,6 +8615,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 1514facb15d9d..0d516ef3b00b1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3533,6 +3538,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3602,6 +3608,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3767,6 +3774,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3867,6 +3875,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4396,6 +4405,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4762,6 +4772,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4786,6 +4797,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4842,6 +4854,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5038,6 +5051,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5322,6 +5337,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5394,6 +5410,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5856,6 +5873,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5885,6 +5903,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6085,6 +6104,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6850,6 +6870,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6920,6 +6941,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6948,7 +6970,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7027,6 +7051,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7331,6 +7356,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8154,6 +8180,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8393,6 +8420,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8558,6 +8586,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8585,6 +8614,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index a96b87bc33cc7..23f248767de05 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3533,6 +3538,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3602,6 +3608,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3767,6 +3774,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3866,6 +3874,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4395,6 +4404,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4761,6 +4771,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4785,6 +4796,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4841,6 +4853,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5037,6 +5050,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5321,6 +5336,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5393,6 +5409,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5855,6 +5872,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5884,6 +5902,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6084,6 +6103,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6849,6 +6869,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6919,6 +6940,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6947,7 +6969,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7026,6 +7050,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7330,6 +7355,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8152,6 +8178,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8391,6 +8418,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8556,6 +8584,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8583,6 +8612,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index b2c6af6a0abd7..546298ae58163 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1502,6 +1503,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2424,6 +2427,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2720,6 +2724,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3530,6 +3535,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3599,6 +3605,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3764,6 +3771,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3863,6 +3871,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4392,6 +4401,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4758,6 +4768,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4782,6 +4793,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4838,6 +4850,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5034,6 +5047,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5318,6 +5333,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5390,6 +5406,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5851,6 +5868,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5880,6 +5898,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6080,6 +6099,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6845,6 +6865,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6915,6 +6936,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6942,7 +6964,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7021,6 +7045,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7325,6 +7350,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8147,6 +8173,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8386,6 +8413,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8551,6 +8579,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8578,6 +8607,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 277d0afdb9c6f..83357e85a480d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1501,6 +1502,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2422,6 +2425,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2717,6 +2721,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3526,6 +3531,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3595,6 +3601,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3760,6 +3767,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3859,6 +3867,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4388,6 +4397,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4754,6 +4764,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4778,6 +4789,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4834,6 +4846,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5030,6 +5043,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5314,6 +5329,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5386,6 +5402,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5847,6 +5864,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5876,6 +5894,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6074,6 +6093,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6839,6 +6859,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6909,6 +6930,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6935,7 +6957,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7014,6 +7038,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7318,6 +7343,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8138,6 +8164,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8377,6 +8404,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8542,6 +8570,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8569,6 +8598,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 704d124cfe29e..805787d79cc8c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1504,6 +1505,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2429,6 +2432,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2725,6 +2729,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3540,6 +3545,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3609,6 +3615,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3774,6 +3781,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3875,6 +3883,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4406,6 +4415,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4772,6 +4782,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4796,6 +4807,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4852,6 +4864,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5055,6 +5068,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5339,6 +5354,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5411,6 +5427,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5875,6 +5892,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5904,6 +5922,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6105,6 +6124,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6871,6 +6891,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6941,6 +6962,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6969,7 +6991,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7048,6 +7072,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7352,6 +7377,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8178,6 +8204,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8419,6 +8446,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8584,6 +8612,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8611,6 +8640,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 65b5d6c624e34..51c417a9f8125 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2428,6 +2431,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2724,6 +2728,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3538,6 +3543,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3607,6 +3613,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3772,6 +3779,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3873,6 +3881,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4403,6 +4412,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4769,6 +4779,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4793,6 +4804,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4849,6 +4861,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5052,6 +5065,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5336,6 +5351,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5408,6 +5424,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5872,6 +5889,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5901,6 +5919,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6101,6 +6120,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6867,6 +6887,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6937,6 +6958,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6965,7 +6987,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7044,6 +7068,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7348,6 +7373,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8173,6 +8199,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8414,6 +8441,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8579,6 +8607,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8606,6 +8635,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 04d8f345d9470..81f9a63bb683e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3537,6 +3542,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3606,6 +3612,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3771,6 +3778,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3872,6 +3880,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4402,6 +4411,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4768,6 +4778,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4792,6 +4803,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4848,6 +4860,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5051,6 +5064,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5335,6 +5350,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5407,6 +5423,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5871,6 +5888,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5900,6 +5918,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6100,6 +6119,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6866,6 +6886,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6936,6 +6957,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6964,7 +6986,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7043,6 +7067,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7347,6 +7372,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8172,6 +8198,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8412,6 +8439,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8577,6 +8605,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8604,6 +8633,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index acb8e4c739857..5b1f3e1dcf348 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3537,6 +3542,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3606,6 +3612,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3771,6 +3778,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3872,6 +3880,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4402,6 +4411,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4768,6 +4778,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4792,6 +4803,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4848,6 +4860,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5046,6 +5059,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5330,6 +5345,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5402,6 +5418,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5866,6 +5883,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5895,6 +5913,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6095,6 +6114,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6861,6 +6881,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6931,6 +6952,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6959,7 +6981,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7038,6 +7062,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7342,6 +7367,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8167,6 +8193,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8407,6 +8434,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8572,6 +8600,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8599,6 +8628,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index b68f0ea1bb228..ac4010b02ce76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3535,6 +3540,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3604,6 +3610,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3769,6 +3776,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3869,6 +3877,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4399,6 +4408,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4765,6 +4775,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4789,6 +4800,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4845,6 +4857,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5043,6 +5056,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5327,6 +5342,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5399,6 +5415,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5862,6 +5879,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5891,6 +5909,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6091,6 +6110,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6857,6 +6877,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6927,6 +6948,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6955,7 +6977,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7034,6 +7058,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7338,6 +7363,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8163,6 +8189,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8402,6 +8429,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8567,6 +8595,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8594,6 +8623,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index bd38b54e1732d..88c8976fcdebe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1503,6 +1504,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2427,6 +2430,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = dontDistribute super."cryptol"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2723,6 +2727,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3534,6 +3539,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3603,6 +3609,7 @@ self: super: { "gitrev" = dontDistribute super."gitrev"; "gitson" = dontDistribute super."gitson"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_6_3"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3768,6 +3775,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3868,6 +3876,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4398,6 +4407,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4764,6 +4774,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4788,6 +4799,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4844,6 +4856,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5042,6 +5055,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5326,6 +5341,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5398,6 +5414,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5861,6 +5878,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5890,6 +5908,7 @@ self: super: { "monad-extras" = doDistribute super."monad-extras_0_5_9"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_6_0_2"; @@ -6090,6 +6109,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6856,6 +6876,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6926,6 +6947,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6954,7 +6976,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -7033,6 +7057,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7337,6 +7362,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8162,6 +8188,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8401,6 +8428,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8566,6 +8594,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8593,6 +8622,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 30ba247b98fc7..71aaba0f7c799 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1493,6 +1494,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2409,6 +2412,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_1"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2704,6 +2708,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3511,6 +3516,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3579,6 +3585,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_4"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3744,6 +3751,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3842,6 +3850,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4370,6 +4379,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4735,6 +4745,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4758,6 +4769,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4814,6 +4826,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5005,6 +5018,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5285,6 +5300,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5356,6 +5372,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5813,6 +5830,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5842,6 +5860,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6035,6 +6054,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6538,6 +6558,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6794,6 +6815,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6863,6 +6885,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6890,7 +6913,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6969,6 +6994,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7273,6 +7299,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8086,6 +8113,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8325,6 +8353,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8489,6 +8518,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8516,6 +8546,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 7b1e884ee5831..b99a3578e26d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1493,6 +1494,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2408,6 +2411,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_1"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2703,6 +2707,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3510,6 +3515,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3578,6 +3584,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_4"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3743,6 +3750,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3841,6 +3849,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4369,6 +4378,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4734,6 +4744,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4757,6 +4768,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4813,6 +4825,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5004,6 +5017,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5284,6 +5299,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5355,6 +5371,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5812,6 +5829,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5841,6 +5859,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6034,6 +6053,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6537,6 +6557,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6793,6 +6814,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6862,6 +6884,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6889,7 +6912,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6968,6 +6993,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7272,6 +7298,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8085,6 +8112,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8324,6 +8352,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8488,6 +8517,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8515,6 +8545,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 2b4bcfffd6e89..168ea03492292 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1486,6 +1487,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2396,6 +2399,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2690,6 +2694,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3493,6 +3498,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3561,6 +3567,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3726,6 +3733,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3823,6 +3831,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4350,6 +4359,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4714,6 +4724,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4737,6 +4748,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4792,6 +4804,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4982,6 +4995,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5260,6 +5275,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5331,6 +5347,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5596,7 +5613,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5642,6 +5661,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5784,6 +5804,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5813,6 +5834,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6006,6 +6028,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6504,9 +6527,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6762,6 +6787,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6830,6 +6856,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6857,7 +6884,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6936,6 +6965,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7238,6 +7268,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8043,6 +8074,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8280,6 +8312,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8444,6 +8477,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8471,6 +8505,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 25c4b95bba16d..0458c7f6fa587 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2395,6 +2398,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2689,6 +2693,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3491,6 +3496,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3559,6 +3565,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3724,6 +3731,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3821,6 +3829,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4347,6 +4356,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4711,6 +4721,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4734,6 +4745,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4789,6 +4801,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4979,6 +4992,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5256,6 +5271,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5327,6 +5343,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5592,7 +5609,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5638,6 +5657,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5780,6 +5800,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5809,6 +5830,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -6001,6 +6023,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6498,9 +6521,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6756,6 +6781,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6824,6 +6850,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6851,7 +6878,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6930,6 +6959,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7231,6 +7261,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8034,6 +8065,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8271,6 +8303,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8435,6 +8468,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8462,6 +8496,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 15edd3cf4aa9a..baf1df1a41c8c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2395,6 +2398,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2689,6 +2693,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3491,6 +3496,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3559,6 +3565,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3724,6 +3731,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3821,6 +3829,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4347,6 +4356,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4711,6 +4721,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4734,6 +4745,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4789,6 +4801,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4979,6 +4992,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5256,6 +5271,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5327,6 +5343,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5592,7 +5609,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5638,6 +5657,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5780,6 +5800,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5809,6 +5830,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -6001,6 +6023,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6498,9 +6521,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6756,6 +6781,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6824,6 +6850,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6851,7 +6878,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6930,6 +6959,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7231,6 +7261,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8033,6 +8064,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8270,6 +8302,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8434,6 +8467,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8461,6 +8495,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index f7f3d0135900e..539dce09b7e6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2395,6 +2398,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2689,6 +2693,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3491,6 +3496,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3559,6 +3565,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3724,6 +3731,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3821,6 +3829,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4346,6 +4355,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4710,6 +4720,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4733,6 +4744,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4788,6 +4800,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4977,6 +4990,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5254,6 +5269,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5325,6 +5341,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5590,7 +5607,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5636,6 +5655,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5778,6 +5798,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5807,6 +5828,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5999,6 +6021,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6496,9 +6519,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6754,6 +6779,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6822,6 +6848,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6849,7 +6876,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6928,6 +6957,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7229,6 +7259,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8031,6 +8062,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8268,6 +8300,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8432,6 +8465,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8459,6 +8493,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 2db86ffa7af97..bc153d27d4d25 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2395,6 +2398,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2689,6 +2693,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3490,6 +3495,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3558,6 +3564,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3723,6 +3730,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3820,6 +3828,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4345,6 +4354,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4708,6 +4718,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4731,6 +4742,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4786,6 +4798,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4975,6 +4988,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5252,6 +5267,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5323,6 +5339,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5588,7 +5605,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5634,6 +5653,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5776,6 +5796,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5805,6 +5826,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5997,6 +6019,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6494,9 +6517,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6752,6 +6777,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6820,6 +6846,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6847,7 +6874,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6926,6 +6955,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7227,6 +7257,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8028,6 +8059,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8265,6 +8297,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8429,6 +8462,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8456,6 +8490,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index b80dfba74b5fd..25f1ebb4746e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2395,6 +2398,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2689,6 +2693,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3489,6 +3494,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3557,6 +3563,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3722,6 +3729,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3819,6 +3827,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4344,6 +4353,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4707,6 +4717,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4730,6 +4741,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4785,6 +4797,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4974,6 +4987,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5251,6 +5266,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5322,6 +5338,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5587,7 +5604,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5633,6 +5652,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5775,6 +5795,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5804,6 +5825,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5995,6 +6017,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6492,9 +6515,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6750,6 +6775,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6818,6 +6844,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6845,7 +6872,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6924,6 +6953,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7225,6 +7255,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8025,6 +8056,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8262,6 +8294,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8426,6 +8459,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8453,6 +8487,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index ce6662633818c..28ce1c139ed7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1485,6 +1486,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2393,6 +2396,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2686,6 +2690,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3485,6 +3490,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3553,6 +3559,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3718,6 +3725,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3815,6 +3823,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4340,6 +4349,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4703,6 +4713,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4726,6 +4737,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4781,6 +4793,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4970,6 +4983,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5247,6 +5262,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5317,6 +5333,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5582,7 +5599,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5628,6 +5647,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5770,6 +5790,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5799,6 +5820,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5990,6 +6012,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6487,9 +6510,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6745,6 +6770,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6813,6 +6839,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6840,7 +6867,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6919,6 +6948,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7220,6 +7250,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8020,6 +8051,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8257,6 +8289,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8421,6 +8454,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8448,6 +8482,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 1e8a2763fbb5a..6285c0d2fc991 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2391,6 +2394,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2684,6 +2688,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3481,6 +3486,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3549,6 +3555,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3714,6 +3721,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3811,6 +3819,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4336,6 +4345,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4699,6 +4709,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4722,6 +4733,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5_1"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4777,6 +4789,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4966,6 +4979,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5243,6 +5258,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5313,6 +5329,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5578,7 +5595,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5624,6 +5643,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5766,6 +5786,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5795,6 +5816,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5986,6 +6008,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6482,9 +6505,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6740,6 +6765,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6808,6 +6834,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6835,7 +6862,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6914,6 +6943,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7215,6 +7245,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8015,6 +8046,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8252,6 +8284,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8416,6 +8449,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8443,6 +8477,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index d6519d66eb0b3..485cb290ded6e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2390,6 +2393,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2683,6 +2687,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3479,6 +3484,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3547,6 +3553,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3712,6 +3719,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3809,6 +3817,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4334,6 +4343,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4697,6 +4707,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4720,6 +4731,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5_1"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4775,6 +4787,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4964,6 +4977,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5241,6 +5256,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5311,6 +5327,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5576,7 +5593,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5622,6 +5641,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5764,6 +5784,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5793,6 +5814,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5984,6 +6006,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6479,9 +6502,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6737,6 +6762,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6805,6 +6831,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6832,7 +6859,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6911,6 +6940,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7212,6 +7242,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8011,6 +8042,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8248,6 +8280,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8412,6 +8445,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8439,6 +8473,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 43ec086efd64c..f8db93c6968ea 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2390,6 +2393,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2683,6 +2687,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3478,6 +3483,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3546,6 +3552,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3711,6 +3718,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3808,6 +3816,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4333,6 +4342,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4696,6 +4706,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4719,6 +4730,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5_1"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4774,6 +4786,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4963,6 +4976,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5240,6 +5255,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5310,6 +5326,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5575,7 +5592,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5621,6 +5640,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5762,6 +5782,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5791,6 +5812,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5982,6 +6004,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6477,9 +6500,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6735,6 +6760,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6803,6 +6829,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6830,7 +6857,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6909,6 +6938,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7210,6 +7240,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8008,6 +8039,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8245,6 +8277,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8409,6 +8442,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8436,6 +8470,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 301d968c8ce2a..e3c531543f49c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1492,6 +1493,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2405,6 +2408,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_1"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2700,6 +2704,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3507,6 +3512,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3575,6 +3581,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_4"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3740,6 +3747,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3838,6 +3846,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4366,6 +4375,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4731,6 +4741,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4754,6 +4765,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4810,6 +4822,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -5001,6 +5014,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5281,6 +5296,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5352,6 +5368,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5809,6 +5826,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5838,6 +5856,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6031,6 +6050,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6534,6 +6554,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6790,6 +6811,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6859,6 +6881,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6886,7 +6909,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6965,6 +6990,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7269,6 +7295,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8082,6 +8109,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8321,6 +8349,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8485,6 +8514,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8512,6 +8542,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index fb9c2c7c2d3cb..4e691183c72e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2389,6 +2392,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2682,6 +2686,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3477,6 +3482,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3545,6 +3551,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3710,6 +3717,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3807,6 +3815,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4332,6 +4341,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4695,6 +4705,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4718,6 +4729,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_7_1"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4773,6 +4785,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4962,6 +4975,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5239,6 +5254,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5309,6 +5325,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5574,7 +5591,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5620,6 +5639,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5761,6 +5781,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_0"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5790,6 +5811,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5981,6 +6003,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6476,9 +6499,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6733,6 +6758,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6801,6 +6827,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6828,7 +6855,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6907,6 +6936,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7208,6 +7238,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8005,6 +8036,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8242,6 +8274,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8406,6 +8439,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8433,6 +8467,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 81d1eaa0e0081..78b6bc0f7fb1a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2389,6 +2392,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2682,6 +2686,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3477,6 +3482,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3545,6 +3551,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3710,6 +3717,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3807,6 +3815,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4332,6 +4341,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4695,6 +4705,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4718,6 +4729,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_7_2"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4773,6 +4785,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4962,6 +4975,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5239,6 +5254,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5309,6 +5325,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5574,7 +5591,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5620,6 +5639,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5761,6 +5781,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_0"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5790,6 +5811,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5981,6 +6003,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6476,9 +6499,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6732,6 +6757,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6800,6 +6826,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6827,7 +6854,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6906,6 +6935,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7207,6 +7237,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8004,6 +8035,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8241,6 +8273,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8405,6 +8438,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8432,6 +8466,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 607837e207e2b..dce3be779b823 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1484,6 +1485,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2389,6 +2392,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2682,6 +2686,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3477,6 +3482,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3545,6 +3551,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3710,6 +3717,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3807,6 +3815,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4331,6 +4340,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4694,6 +4704,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4717,6 +4728,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_7_2"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4772,6 +4784,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4961,6 +4974,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5238,6 +5253,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5308,6 +5324,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5573,7 +5590,9 @@ self: super: { "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5619,6 +5638,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5760,6 +5780,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5789,6 +5810,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5980,6 +6002,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6475,9 +6498,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6731,6 +6756,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6799,6 +6825,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6826,7 +6853,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6905,6 +6934,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7206,6 +7236,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8003,6 +8034,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8240,6 +8272,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8404,6 +8437,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8431,6 +8465,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 547776053b2c4..8d75abce9056a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1492,6 +1493,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2405,6 +2408,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2700,6 +2704,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3506,6 +3511,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3574,6 +3580,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_5"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3739,6 +3746,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3837,6 +3845,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4365,6 +4374,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4730,6 +4740,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4753,6 +4764,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4809,6 +4821,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4999,6 +5012,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5279,6 +5294,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5350,6 +5366,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5807,6 +5824,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5836,6 +5854,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6029,6 +6048,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6532,6 +6552,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6788,6 +6809,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6857,6 +6879,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6884,7 +6907,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6963,6 +6988,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7267,6 +7293,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8080,6 +8107,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8319,6 +8347,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8483,6 +8512,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8510,6 +8540,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index f3b120df6abec..df9e812a624a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1492,6 +1493,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2404,6 +2407,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2699,6 +2703,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3505,6 +3510,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3573,6 +3579,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_5"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3738,6 +3745,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3836,6 +3844,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4364,6 +4373,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4729,6 +4739,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4752,6 +4763,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4808,6 +4820,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4998,6 +5011,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5278,6 +5293,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5349,6 +5365,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5806,6 +5823,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5835,6 +5853,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6028,6 +6047,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6530,6 +6550,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6786,6 +6807,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6855,6 +6877,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6882,7 +6905,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6961,6 +6986,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7264,6 +7290,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8077,6 +8104,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8316,6 +8344,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8480,6 +8509,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8507,6 +8537,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 86c810c0506c7..4be1a01459d49 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1492,6 +1493,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2403,6 +2406,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2698,6 +2702,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3504,6 +3509,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3572,6 +3578,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_5"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3737,6 +3744,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3835,6 +3843,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4363,6 +4372,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4728,6 +4738,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4751,6 +4762,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4807,6 +4819,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4997,6 +5010,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5277,6 +5292,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5348,6 +5364,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5805,6 +5822,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5834,6 +5852,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6027,6 +6046,7 @@ self: super: { "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; "nanospec" = doDistribute super."nanospec_0_2_0"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6529,6 +6549,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6785,6 +6806,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6854,6 +6876,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6881,7 +6904,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6960,6 +6985,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7263,6 +7289,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8076,6 +8103,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8315,6 +8343,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8479,6 +8508,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8506,6 +8536,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index ff9dfccadcfba..05fb1073481ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1490,6 +1491,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2400,6 +2403,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2695,6 +2699,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3501,6 +3506,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3569,6 +3575,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_6"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3734,6 +3741,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3831,6 +3839,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4358,6 +4367,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4723,6 +4733,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4746,6 +4757,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4802,6 +4814,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4992,6 +5005,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5272,6 +5287,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5343,6 +5359,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5800,6 +5817,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5829,6 +5847,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6021,6 +6040,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6523,6 +6543,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6779,6 +6800,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6848,6 +6870,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6875,7 +6898,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6954,6 +6979,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7257,6 +7283,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8070,6 +8097,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8307,6 +8335,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8471,6 +8500,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8498,6 +8528,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 127045918a711..0efc62933c265 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1489,6 +1490,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2399,6 +2402,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2694,6 +2698,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3500,6 +3505,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3568,6 +3574,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_6"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3733,6 +3740,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3830,6 +3838,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4357,6 +4366,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4722,6 +4732,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4745,6 +4756,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4801,6 +4813,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4991,6 +5004,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5271,6 +5286,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5342,6 +5358,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5799,6 +5816,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5828,6 +5846,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6021,6 +6040,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6523,6 +6543,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6779,6 +6800,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6848,6 +6870,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6875,7 +6898,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6954,6 +6979,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7257,6 +7283,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8070,6 +8097,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8307,6 +8335,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8471,6 +8500,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8498,6 +8528,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 9e24f7278cc9e..58baca1128766 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1488,6 +1489,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2398,6 +2401,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2693,6 +2697,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3498,6 +3503,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3566,6 +3572,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_6"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3731,6 +3738,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3828,6 +3836,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4355,6 +4364,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4720,6 +4730,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4743,6 +4754,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4799,6 +4811,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4989,6 +5002,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5269,6 +5284,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5340,6 +5356,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5797,6 +5814,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5826,6 +5844,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6019,6 +6038,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6521,6 +6541,7 @@ self: super: { "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6777,6 +6798,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6846,6 +6868,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6873,7 +6896,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6952,6 +6977,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7254,6 +7280,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8064,6 +8091,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8301,6 +8329,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8465,6 +8494,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8492,6 +8522,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 321b21984d4a1..525aa9a24b3f3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -62,6 +62,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1486,6 +1487,8 @@ self: super: { "auto" = dontDistribute super."auto"; "auto-update" = doDistribute super."auto-update_0_1_2_1"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2396,6 +2399,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_2"; "cryptonite" = dontDistribute super."cryptonite"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2691,6 +2695,7 @@ self: super: { "diagrams-solve" = dontDistribute super."diagrams-solve"; "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice" = dontDistribute super."dice"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; @@ -3494,6 +3499,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3562,6 +3568,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3727,6 +3734,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3824,6 +3832,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4351,6 +4360,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4715,6 +4725,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4738,6 +4749,7 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; "http-common" = dontDistribute super."http-common"; "http-conduit" = doDistribute super."http-conduit_2_1_5"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; @@ -4793,6 +4805,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = dontDistribute super."hvect"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4983,6 +4996,8 @@ self: super: { "invariant" = dontDistribute super."invariant"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5263,6 +5278,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5334,6 +5350,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5647,6 +5664,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = doDistribute super."markdown-unlit_0_2_0_1"; @@ -5789,6 +5807,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = dontDistribute super."mockery"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5818,6 +5837,7 @@ self: super: { "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-journal" = doDistribute super."monad-journal_0_7"; @@ -6011,6 +6031,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6509,9 +6530,11 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_5"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_3"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bgzf" = dontDistribute super."pipes-bgzf"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6768,6 +6791,7 @@ self: super: { "protocol-buffers-descriptor" = dontDistribute super."protocol-buffers-descriptor"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6837,6 +6861,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6864,7 +6889,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6943,6 +6970,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7245,6 +7273,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -8051,6 +8080,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8288,6 +8318,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8452,6 +8483,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8479,6 +8511,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 35a05fd87d4ba..2f63061261296 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1448,6 +1449,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2331,6 +2334,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2620,6 +2624,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3394,6 +3399,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3462,6 +3468,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3626,6 +3633,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3720,6 +3728,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4237,6 +4246,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4596,6 +4606,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4620,6 +4631,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4672,6 +4685,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4852,6 +4866,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5113,6 +5129,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5181,6 +5198,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5438,7 +5456,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5483,6 +5503,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5620,6 +5641,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5648,6 +5670,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5831,6 +5854,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6313,8 +6337,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6560,6 +6586,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_4"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6630,6 +6657,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6657,7 +6685,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6668,6 +6698,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6734,6 +6765,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7036,6 +7068,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7815,6 +7848,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8044,6 +8078,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8206,6 +8241,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8233,6 +8269,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8310,6 +8347,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 7af46a481351f..71f470495ebb8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1447,6 +1448,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2330,6 +2333,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2619,6 +2623,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3392,6 +3397,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3460,6 +3466,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3624,6 +3631,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3718,6 +3726,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4235,6 +4244,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4594,6 +4604,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4618,6 +4629,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4670,6 +4683,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4850,6 +4864,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5111,6 +5127,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5179,6 +5196,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5435,7 +5453,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5480,6 +5500,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5617,6 +5638,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5645,6 +5667,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5827,6 +5850,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6308,8 +6332,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6555,6 +6581,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_4"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6625,6 +6652,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6652,7 +6680,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6663,6 +6693,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6729,6 +6760,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7030,6 +7062,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7809,6 +7842,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8038,6 +8072,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8200,6 +8235,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8227,6 +8263,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8304,6 +8341,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index fe0690ee942f6..780ff76271a45 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1440,6 +1441,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2319,6 +2322,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2605,6 +2609,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2685,6 +2690,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3370,6 +3376,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3436,6 +3443,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3600,6 +3608,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3694,6 +3703,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4209,6 +4219,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4566,6 +4577,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4590,6 +4602,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4642,6 +4656,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4820,6 +4835,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5078,6 +5095,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5146,6 +5164,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5400,7 +5419,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5445,6 +5466,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5581,6 +5603,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5609,6 +5632,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5667,6 +5691,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5789,6 +5814,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6266,8 +6292,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6508,6 +6536,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6578,6 +6607,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6604,7 +6634,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6615,6 +6647,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6681,6 +6714,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6981,6 +7015,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7157,6 +7192,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7752,6 +7788,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7980,6 +8017,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8141,6 +8179,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8168,6 +8207,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8243,6 +8283,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 67205eb5067e2..219ce8c5bca62 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1440,6 +1441,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2318,6 +2321,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2604,6 +2608,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2684,6 +2689,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3368,6 +3374,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3434,6 +3441,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3598,6 +3606,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3692,6 +3701,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4207,6 +4217,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4564,6 +4575,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4588,6 +4600,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4640,6 +4654,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4818,6 +4833,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5076,6 +5093,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5144,6 +5162,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5398,7 +5417,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5443,6 +5464,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5579,6 +5601,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5607,6 +5630,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5665,6 +5689,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5787,6 +5812,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6263,8 +6289,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6505,6 +6533,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6575,6 +6604,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6601,7 +6631,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6612,6 +6644,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6678,6 +6711,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6978,6 +7012,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7154,6 +7189,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7749,6 +7785,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7977,6 +8014,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8138,6 +8176,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8165,6 +8204,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8240,6 +8280,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index a81c742f03300..ae199402bb83f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1440,6 +1441,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2317,6 +2320,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2603,6 +2607,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2683,6 +2688,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3367,6 +3373,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3433,6 +3440,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3596,6 +3604,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3690,6 +3699,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4205,6 +4215,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4562,6 +4573,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4586,6 +4598,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4638,6 +4652,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4816,6 +4831,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5074,6 +5091,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5142,6 +5160,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5396,7 +5415,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5441,6 +5462,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5577,6 +5599,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5605,6 +5628,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5663,6 +5687,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5785,6 +5810,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6260,8 +6286,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6502,6 +6530,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6572,6 +6601,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6598,7 +6628,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6609,6 +6641,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6675,6 +6708,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6975,6 +7009,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7151,6 +7186,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7746,6 +7782,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7972,6 +8009,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8133,6 +8171,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8160,6 +8199,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8235,6 +8275,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 79610166c8d6d..4650f41cec95b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1440,6 +1441,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2317,6 +2320,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2603,6 +2607,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2683,6 +2688,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3367,6 +3373,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3433,6 +3440,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3596,6 +3604,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3690,6 +3699,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4204,6 +4214,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4561,6 +4572,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4585,6 +4597,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4637,6 +4651,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4815,6 +4830,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5073,6 +5090,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5141,6 +5159,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5394,7 +5413,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5439,6 +5460,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5575,6 +5597,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5603,6 +5626,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5661,6 +5685,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5783,6 +5808,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6257,8 +6283,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6499,6 +6527,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6569,6 +6598,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6595,7 +6625,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6606,6 +6638,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6672,6 +6705,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6972,6 +7006,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7148,6 +7183,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7743,6 +7779,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7969,6 +8006,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8130,6 +8168,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8157,6 +8196,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8232,6 +8272,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 68aacafb13f56..bc556968a5e2d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1438,6 +1439,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2313,6 +2316,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2597,6 +2601,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2677,6 +2682,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3361,6 +3367,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3427,6 +3434,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3590,6 +3598,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3684,6 +3693,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4198,6 +4208,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4554,6 +4565,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4578,6 +4590,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4630,6 +4644,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4808,6 +4823,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5066,6 +5083,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5134,6 +5152,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5387,7 +5406,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5432,6 +5453,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5568,6 +5590,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5596,6 +5619,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5654,6 +5678,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5776,6 +5801,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6250,8 +6276,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6492,6 +6520,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6562,6 +6591,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6588,7 +6618,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6599,6 +6631,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6665,6 +6698,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6965,6 +6999,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7141,6 +7176,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7736,6 +7772,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7962,6 +7999,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8123,6 +8161,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8150,6 +8189,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8225,6 +8265,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index b3c63a710abe7..1ac8a09b7bc59 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1438,6 +1439,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2313,6 +2316,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2597,6 +2601,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2677,6 +2682,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3361,6 +3367,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3427,6 +3434,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3590,6 +3598,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3684,6 +3693,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4197,6 +4207,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4552,6 +4563,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4576,6 +4588,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4627,6 +4641,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4805,6 +4820,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5063,6 +5080,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5131,6 +5149,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5384,7 +5403,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5429,6 +5450,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5565,6 +5587,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5593,6 +5616,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5651,6 +5675,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5773,6 +5798,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6247,8 +6273,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6489,6 +6517,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6559,6 +6588,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6585,7 +6615,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6596,6 +6628,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6662,6 +6695,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6962,6 +6996,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7137,6 +7172,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7732,6 +7768,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7958,6 +7995,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8119,6 +8157,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8146,6 +8185,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8221,6 +8261,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 067bc308136d2..3cea49933c49c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1437,6 +1438,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2312,6 +2315,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2596,6 +2600,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2676,6 +2681,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3359,6 +3365,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3425,6 +3432,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3588,6 +3596,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3681,6 +3690,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4194,6 +4204,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4549,6 +4560,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4573,6 +4585,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4624,6 +4638,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4802,6 +4817,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5060,6 +5077,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5127,6 +5145,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5380,7 +5399,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5425,6 +5446,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5560,6 +5582,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5588,6 +5611,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5646,6 +5670,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5768,6 +5793,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6242,8 +6268,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6483,6 +6511,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6553,6 +6582,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6579,7 +6609,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6590,6 +6622,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6656,6 +6689,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6955,6 +6989,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7130,6 +7165,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7723,6 +7759,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7948,6 +7985,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8109,6 +8147,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8136,6 +8175,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8211,6 +8251,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 0592f86bdc3b4..fa7a46da9d76c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1436,6 +1437,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2311,6 +2314,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2595,6 +2599,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2675,6 +2680,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3358,6 +3364,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3424,6 +3431,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3587,6 +3595,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3680,6 +3689,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4192,6 +4202,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4547,6 +4558,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4571,6 +4583,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4622,6 +4636,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4799,6 +4814,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5057,6 +5074,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5124,6 +5142,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5376,7 +5395,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5421,6 +5442,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5556,6 +5578,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5584,6 +5607,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5641,6 +5665,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5763,6 +5788,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6237,8 +6263,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6478,6 +6506,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_9"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6548,6 +6577,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6574,7 +6604,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6585,6 +6617,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6651,6 +6684,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6950,6 +6984,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7125,6 +7160,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7718,6 +7754,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7943,6 +7980,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8104,6 +8142,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8131,6 +8170,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8206,6 +8246,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 00df06ee5f840..90a553ae7f6a5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1436,6 +1437,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2310,6 +2313,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2594,6 +2598,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2674,6 +2679,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3357,6 +3363,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3422,6 +3429,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3584,6 +3592,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3676,6 +3685,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4187,6 +4197,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4542,6 +4553,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4565,6 +4577,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4616,6 +4630,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4793,6 +4808,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5051,6 +5068,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5118,6 +5136,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5370,7 +5389,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5415,6 +5436,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5550,6 +5572,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5578,6 +5601,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5635,6 +5659,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5757,6 +5782,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6230,8 +6256,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6471,6 +6499,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6541,6 +6570,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6567,7 +6597,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6578,6 +6610,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6644,6 +6677,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6943,6 +6977,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7118,6 +7153,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7710,6 +7746,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7935,6 +7972,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8096,6 +8134,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8123,6 +8162,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8198,6 +8238,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index bdbe5483706e6..b188b36981fad 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1433,6 +1434,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2304,6 +2307,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2588,6 +2592,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2668,6 +2673,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3351,6 +3357,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3416,6 +3423,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3578,6 +3586,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3670,6 +3679,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4181,6 +4191,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4534,6 +4545,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4557,6 +4569,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4608,6 +4622,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4785,6 +4800,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5042,6 +5059,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5109,6 +5127,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5360,7 +5379,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5405,6 +5426,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5540,6 +5562,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5568,6 +5591,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5625,6 +5649,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5747,6 +5772,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6219,8 +6245,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6460,6 +6488,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6530,6 +6559,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6556,7 +6586,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6567,6 +6599,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6633,6 +6666,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6932,6 +6966,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7107,6 +7142,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7698,6 +7734,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7923,6 +7960,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8084,6 +8122,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8111,6 +8150,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8186,6 +8226,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index d7de4a3461985..2cc1919478447 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1445,6 +1446,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2328,6 +2331,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2617,6 +2621,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3388,6 +3393,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3456,6 +3462,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3620,6 +3627,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3714,6 +3722,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4231,6 +4240,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4590,6 +4600,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4614,6 +4625,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4666,6 +4679,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4846,6 +4860,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5106,6 +5122,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5174,6 +5191,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5429,7 +5447,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5474,6 +5494,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5611,6 +5632,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5639,6 +5661,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5821,6 +5844,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6302,8 +6326,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6549,6 +6575,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_4"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6619,6 +6646,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6645,7 +6673,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6656,6 +6686,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6722,6 +6753,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7023,6 +7055,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7801,6 +7834,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8030,6 +8064,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8192,6 +8227,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8219,6 +8255,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8296,6 +8333,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 23db250f1fd5c..1e73dfd575389 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1432,6 +1433,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2303,6 +2306,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2587,6 +2591,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2667,6 +2672,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3350,6 +3356,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3415,6 +3422,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3577,6 +3585,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3669,6 +3678,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4180,6 +4190,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4533,6 +4544,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4556,6 +4568,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4607,6 +4621,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4784,6 +4799,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5041,6 +5058,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5108,6 +5126,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5359,7 +5378,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5404,6 +5425,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5539,6 +5561,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5567,6 +5590,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5624,6 +5648,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5746,6 +5771,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6218,8 +6244,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6459,6 +6487,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6529,6 +6558,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6555,7 +6585,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6566,6 +6598,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6632,6 +6665,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6930,6 +6964,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7105,6 +7140,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7695,6 +7731,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7920,6 +7957,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8081,6 +8119,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8108,6 +8147,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8183,6 +8223,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 0a083cff7063e..b6e3b1ef503ce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1432,6 +1433,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2302,6 +2305,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2586,6 +2590,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2666,6 +2671,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3347,6 +3353,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3412,6 +3419,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3574,6 +3582,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3666,6 +3675,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4177,6 +4187,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4530,6 +4541,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4553,6 +4565,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4604,6 +4618,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4779,6 +4794,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5036,6 +5053,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5103,6 +5121,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5354,7 +5373,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5399,6 +5420,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5534,6 +5556,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5562,6 +5585,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5618,6 +5642,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5740,6 +5765,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6211,8 +6237,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6451,6 +6479,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6521,6 +6550,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6547,7 +6577,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6558,6 +6590,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6624,6 +6657,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6920,6 +6954,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7092,6 +7127,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7681,6 +7717,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7906,6 +7943,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8067,6 +8105,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8094,6 +8133,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8169,6 +8209,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 0a0b6e975bef2..1c35577c40bfc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1432,6 +1433,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2302,6 +2305,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2586,6 +2590,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2666,6 +2671,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3345,6 +3351,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3410,6 +3417,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3572,6 +3580,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3664,6 +3673,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4174,6 +4184,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4527,6 +4538,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4550,6 +4562,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4601,6 +4615,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4774,6 +4789,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5030,6 +5047,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5097,6 +5115,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5348,7 +5367,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5393,6 +5414,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5528,6 +5550,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5556,6 +5579,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5612,6 +5636,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5734,6 +5759,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6205,8 +6231,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6445,6 +6473,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6515,6 +6544,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6541,7 +6571,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6552,6 +6584,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6618,6 +6651,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6914,6 +6948,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7086,6 +7121,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7675,6 +7711,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7900,6 +7937,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8061,6 +8099,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8088,6 +8127,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8163,6 +8203,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 01397df180471..cc729839b38ed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1445,6 +1446,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2328,6 +2331,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2617,6 +2621,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3387,6 +3392,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3455,6 +3461,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3619,6 +3626,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3713,6 +3721,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4230,6 +4239,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4588,6 +4598,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4612,6 +4623,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4664,6 +4677,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4844,6 +4858,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5104,6 +5120,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5172,6 +5189,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5427,7 +5445,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5472,6 +5492,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5609,6 +5630,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5637,6 +5659,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5819,6 +5842,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6300,8 +6324,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6547,6 +6573,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_5"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6617,6 +6644,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6643,7 +6671,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6654,6 +6684,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6720,6 +6751,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7020,6 +7052,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7797,6 +7830,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8026,6 +8060,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8188,6 +8223,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8215,6 +8251,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8291,6 +8328,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index f9755359a77ed..01a9caafa271d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1445,6 +1446,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2328,6 +2331,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2617,6 +2621,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3387,6 +3392,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3455,6 +3461,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3619,6 +3626,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3713,6 +3721,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4230,6 +4239,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4588,6 +4598,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4612,6 +4623,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4664,6 +4677,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4844,6 +4858,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5104,6 +5120,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5172,6 +5189,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5427,7 +5445,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5472,6 +5492,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5609,6 +5630,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5637,6 +5659,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5819,6 +5842,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6300,8 +6324,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6547,6 +6573,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_6"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6617,6 +6644,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6643,7 +6671,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6654,6 +6684,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6720,6 +6751,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7020,6 +7052,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7796,6 +7829,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8025,6 +8059,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8187,6 +8222,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8214,6 +8250,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8290,6 +8327,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 7c785b05d0c9c..d427bfbcde7e9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1444,6 +1445,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2327,6 +2330,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2616,6 +2620,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3385,6 +3390,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3453,6 +3459,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3617,6 +3624,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3711,6 +3719,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4227,6 +4236,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4584,6 +4594,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4608,6 +4619,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4660,6 +4673,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4838,6 +4852,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5098,6 +5114,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5166,6 +5183,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5421,7 +5439,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5466,6 +5486,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5603,6 +5624,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5631,6 +5653,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5812,6 +5835,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6292,8 +6316,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6538,6 +6564,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_6"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6608,6 +6635,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6634,7 +6662,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6645,6 +6675,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6711,6 +6742,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7011,6 +7043,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7785,6 +7818,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8013,6 +8047,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8175,6 +8210,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8202,6 +8238,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8278,6 +8315,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 88eaeed0f5b29..00eeb284498ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1444,6 +1445,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2327,6 +2330,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2616,6 +2620,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3384,6 +3389,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3450,6 +3456,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3614,6 +3621,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3708,6 +3716,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4224,6 +4233,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4581,6 +4591,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4605,6 +4616,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4657,6 +4670,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4835,6 +4849,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5093,6 +5109,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5161,6 +5178,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5415,7 +5433,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5460,6 +5480,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5597,6 +5618,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5625,6 +5647,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5683,6 +5706,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5805,6 +5829,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6285,8 +6310,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6531,6 +6558,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6601,6 +6629,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6627,7 +6656,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6638,6 +6669,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; @@ -6704,6 +6736,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -7004,6 +7037,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7778,6 +7812,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -8006,6 +8041,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8167,6 +8203,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8194,6 +8231,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8270,6 +8308,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index fec2f0d3bd69f..fe0bb9ea92376 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1442,6 +1443,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2324,6 +2327,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_4"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2613,6 +2617,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_5"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3381,6 +3386,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3447,6 +3453,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3611,6 +3618,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3705,6 +3713,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4220,6 +4229,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4577,6 +4587,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4601,6 +4612,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4653,6 +4666,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4831,6 +4845,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5089,6 +5105,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5157,6 +5174,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5411,7 +5429,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5456,6 +5476,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5593,6 +5614,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5621,6 +5643,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5679,6 +5702,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5801,6 +5825,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6281,8 +6306,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6525,6 +6552,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6595,6 +6623,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6621,7 +6650,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6632,6 +6663,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6698,6 +6730,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6998,6 +7031,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7771,6 +7805,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7999,6 +8034,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8160,6 +8196,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8187,6 +8224,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8263,6 +8301,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index e21c56a396859..164e06229bf56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1442,6 +1443,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2322,6 +2325,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2608,6 +2612,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3375,6 +3380,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3441,6 +3447,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3605,6 +3612,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3699,6 +3707,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4214,6 +4223,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4571,6 +4581,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4595,6 +4606,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4647,6 +4660,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4825,6 +4839,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5083,6 +5099,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5151,6 +5168,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5405,7 +5423,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5450,6 +5470,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5586,6 +5607,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5614,6 +5636,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5672,6 +5695,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5794,6 +5818,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6274,8 +6299,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6517,6 +6544,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6587,6 +6615,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6613,7 +6642,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6624,6 +6655,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6690,6 +6722,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6990,6 +7023,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7762,6 +7796,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7990,6 +8025,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8151,6 +8187,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8178,6 +8215,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8254,6 +8292,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index e93acae28fa8d..9d6b3a0a81f2e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1440,6 +1441,8 @@ self: super: { "authoring" = dontDistribute super."authoring"; "auto-update" = doDistribute super."auto-update_0_1_2_2"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2319,6 +2322,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_5"; "cryptonite" = doDistribute super."cryptonite_0_6"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2605,6 +2609,7 @@ self: super: { "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -3371,6 +3376,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3437,6 +3443,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3601,6 +3608,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3695,6 +3703,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4210,6 +4219,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4567,6 +4577,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4591,6 +4602,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4643,6 +4656,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hvect" = doDistribute super."hvect_0_2_0_0"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hworker" = dontDistribute super."hworker"; @@ -4821,6 +4835,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; @@ -5079,6 +5095,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -5147,6 +5164,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5401,7 +5419,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5446,6 +5466,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown-unlit" = dontDistribute super."markdown-unlit"; @@ -5582,6 +5603,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5610,6 +5632,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-http" = dontDistribute super."monad-http"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; @@ -5668,6 +5691,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5790,6 +5814,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6269,8 +6294,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_6"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6512,6 +6539,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6582,6 +6610,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6608,7 +6637,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6619,6 +6650,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6685,6 +6717,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = dontDistribute super."read-editor"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline" = dontDistribute super."readline"; "readline-statevar" = dontDistribute super."readline-statevar"; @@ -6985,6 +7018,7 @@ self: super: { "sandlib" = dontDistribute super."sandlib"; "sandman" = dontDistribute super."sandman"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -7757,6 +7791,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7985,6 +8020,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -8146,6 +8182,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -8173,6 +8210,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -8249,6 +8287,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index 98b396a99cbd3..36b97d7d686ac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1405,6 +1406,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2248,6 +2251,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_6"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2523,6 +2527,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2600,6 +2605,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3266,6 +3272,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3327,6 +3334,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3488,6 +3496,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3578,6 +3587,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4074,6 +4084,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4408,6 +4419,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4429,6 +4441,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4476,6 +4490,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4646,6 +4661,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams" = doDistribute super."io-streams_1_3_4_0"; "io-streams-http" = dontDistribute super."io-streams-http"; @@ -4900,6 +4917,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4964,6 +4982,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5207,7 +5226,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5251,6 +5272,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5381,6 +5403,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5408,6 +5431,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; @@ -5460,6 +5484,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5581,6 +5606,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6030,8 +6056,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6260,6 +6288,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6328,6 +6357,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6353,7 +6383,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6364,6 +6396,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6429,6 +6462,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = doDistribute super."read-editor_0_1_0_1"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; @@ -6707,6 +6741,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6875,6 +6910,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7246,6 +7282,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7440,6 +7477,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7611,6 +7649,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7656,6 +7696,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7810,6 +7851,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7836,6 +7878,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7903,6 +7946,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7958,6 +8002,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 407d5b7d404a6..8825b25d688e4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -1403,6 +1404,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2246,6 +2249,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_6"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2521,6 +2525,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2598,6 +2603,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3260,6 +3266,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3321,6 +3328,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; @@ -3482,6 +3490,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3572,6 +3581,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4067,6 +4077,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4401,6 +4412,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4422,6 +4434,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4469,6 +4483,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4635,6 +4650,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4888,6 +4905,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4949,6 +4967,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5192,7 +5211,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_6"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5236,6 +5257,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5366,6 +5388,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5393,6 +5416,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-logger" = doDistribute super."monad-logger_0_3_16"; @@ -5445,6 +5469,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5566,6 +5591,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -6014,8 +6040,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6243,6 +6271,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6311,6 +6340,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6336,7 +6366,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6347,6 +6379,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6412,6 +6445,7 @@ self: super: { "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; "read-editor" = doDistribute super."read-editor_0_1_0_1"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; @@ -6690,6 +6724,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6858,6 +6893,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7229,6 +7265,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7423,6 +7460,7 @@ self: super: { "template-yj" = dontDistribute super."template-yj"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7594,6 +7632,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7639,6 +7679,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7793,6 +7834,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7819,6 +7861,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7886,6 +7929,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7941,6 +7985,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index 992f86ff7a42f..a1f662912d2ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -339,6 +340,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe" = doDistribute super."GPipe_2_1_5"; @@ -710,6 +712,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw" = doDistribute super."OpenGLRaw_3_0_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; @@ -881,6 +884,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1399,6 +1403,8 @@ self: super: { "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -2237,6 +2243,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptol" = doDistribute super."cryptol_2_2_6"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; @@ -2511,6 +2518,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2588,6 +2596,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3244,6 +3253,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3305,6 +3315,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3465,6 +3476,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3554,6 +3566,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -4045,6 +4058,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4377,6 +4391,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4398,6 +4413,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4445,6 +4462,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4608,6 +4626,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4860,6 +4880,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4921,6 +4942,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5164,7 +5186,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5208,6 +5232,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5338,6 +5363,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5365,6 +5391,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; @@ -5415,6 +5442,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5535,6 +5563,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5983,8 +6012,10 @@ self: super: { "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6209,6 +6240,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6277,6 +6309,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6302,7 +6335,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6313,6 +6348,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6377,6 +6413,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readable" = dontDistribute super."readable"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; @@ -6652,6 +6689,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6819,6 +6857,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7184,6 +7223,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7371,12 +7411,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7548,6 +7590,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7593,6 +7637,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7747,6 +7792,7 @@ self: super: { "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7773,6 +7819,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7840,6 +7887,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7895,6 +7943,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index a01d5d3618d71..adb715748e7b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -336,6 +337,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe" = doDistribute super."GPipe_2_1_6"; @@ -701,6 +703,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -870,6 +873,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1380,11 +1384,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1446,6 +1453,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_0"; @@ -2206,6 +2214,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2474,6 +2483,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2549,6 +2559,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3193,6 +3204,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3253,6 +3265,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3412,6 +3425,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3499,6 +3513,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3989,6 +4004,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4321,6 +4337,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4334,6 +4351,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4341,6 +4359,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4386,6 +4406,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4548,6 +4569,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_3"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4798,6 +4821,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4859,6 +4883,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5100,7 +5125,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5144,6 +5171,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5199,6 +5227,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5221,8 +5250,10 @@ self: super: { "microformats2-types" = dontDistribute super."microformats2-types"; "microlens" = doDistribute super."microlens_0_4_1_0"; "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0"; "microlens-th" = doDistribute super."microlens-th_0_3_0_0"; "microtimer" = dontDistribute super."microtimer"; @@ -5269,6 +5300,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5296,6 +5328,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; @@ -5346,6 +5379,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5465,6 +5499,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5907,8 +5942,10 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6128,6 +6165,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6195,6 +6233,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6220,7 +6259,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6231,6 +6272,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6294,6 +6336,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6565,6 +6608,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6730,6 +6774,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7090,6 +7135,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7275,12 +7321,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7446,6 +7494,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7491,6 +7541,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7642,6 +7693,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7668,6 +7720,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7735,6 +7788,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7789,6 +7843,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index 4a1271e520645..15ca4c2b748e3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -336,6 +337,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -700,6 +702,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -869,6 +872,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1378,11 +1382,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1444,6 +1451,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_0"; @@ -2201,6 +2209,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2468,6 +2477,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2543,6 +2553,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3187,6 +3198,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3247,6 +3259,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3406,6 +3419,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3493,6 +3507,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3983,6 +3998,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4315,6 +4331,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4328,6 +4345,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4335,6 +4353,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4380,6 +4400,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4541,6 +4562,8 @@ self: super: { "invariant" = doDistribute super."invariant_0_3"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4791,6 +4814,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4852,6 +4876,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5093,7 +5118,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5137,6 +5164,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5192,6 +5220,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5214,8 +5243,10 @@ self: super: { "microformats2-types" = dontDistribute super."microformats2-types"; "microlens" = doDistribute super."microlens_0_4_1_0"; "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0"; "microlens-th" = doDistribute super."microlens-th_0_3_0_0"; "microtimer" = dontDistribute super."microtimer"; @@ -5262,6 +5293,7 @@ self: super: { "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5288,6 +5320,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-logger" = doDistribute super."monad-logger_0_3_17"; @@ -5338,6 +5371,7 @@ self: super: { "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5457,6 +5491,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5899,8 +5934,10 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6120,6 +6157,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6187,6 +6225,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6212,7 +6251,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6223,6 +6264,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6286,6 +6328,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6556,6 +6599,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6720,6 +6764,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7080,6 +7125,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7264,12 +7310,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7435,6 +7483,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7480,6 +7530,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7631,6 +7682,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7657,6 +7709,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7724,6 +7777,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7778,6 +7832,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix index 4afe0e0a0b8b6..d239e71ac7661 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -332,6 +333,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -692,6 +694,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -861,6 +864,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1364,11 +1368,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1429,8 +1436,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1499,6 +1508,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1887,9 +1897,16 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_16"; + "clash-lib" = doDistribute super."clash-lib_0_6_14"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2156,6 +2173,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2416,6 +2434,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2488,6 +2507,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2569,6 +2589,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3114,6 +3135,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3172,6 +3194,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3331,6 +3354,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3418,6 +3442,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3762,6 +3787,7 @@ self: super: { "hdis86" = dontDistribute super."hdis86"; "hdiscount" = dontDistribute super."hdiscount"; "hdm" = dontDistribute super."hdm"; + "hdocs" = doDistribute super."hdocs_0_4_4_1"; "hdph" = dontDistribute super."hdph"; "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; @@ -3896,6 +3922,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4219,6 +4246,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4232,6 +4260,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4239,6 +4268,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4283,6 +4314,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4440,6 +4472,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4687,6 +4721,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4746,6 +4781,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -4982,7 +5018,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5025,6 +5063,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5079,6 +5118,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -5097,7 +5137,13 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5141,6 +5187,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; @@ -5164,6 +5211,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5204,11 +5252,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5327,6 +5377,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5751,7 +5802,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5771,6 +5824,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -5969,6 +6023,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6034,6 +6089,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6058,7 +6114,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6069,6 +6127,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6131,6 +6190,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6396,6 +6456,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6553,6 +6614,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6839,6 +6901,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6905,6 +6968,8 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; + "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -7082,12 +7147,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7252,6 +7319,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7296,6 +7365,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7444,6 +7514,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7470,6 +7541,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7536,6 +7608,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7588,6 +7661,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7821,6 +7895,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7878,6 +7953,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix index 34f5701d36c55..5c828e8e63e37 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -331,6 +332,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -691,6 +693,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -860,6 +863,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1362,11 +1366,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1424,8 +1431,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1494,6 +1503,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1881,9 +1891,16 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_16"; + "clash-lib" = doDistribute super."clash-lib_0_6_14"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2148,6 +2165,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2408,6 +2426,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2480,6 +2499,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2561,6 +2581,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3104,6 +3125,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3162,6 +3184,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3321,6 +3344,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3408,6 +3432,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3752,6 +3777,7 @@ self: super: { "hdis86" = dontDistribute super."hdis86"; "hdiscount" = dontDistribute super."hdiscount"; "hdm" = dontDistribute super."hdm"; + "hdocs" = doDistribute super."hdocs_0_4_4_1"; "hdph" = dontDistribute super."hdph"; "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; @@ -3886,6 +3912,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4205,6 +4232,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4218,6 +4246,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4225,6 +4254,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4269,6 +4300,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4425,6 +4457,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4672,6 +4706,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4731,6 +4766,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -4967,6 +5003,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; + "machines-io" = doDistribute super."machines-io_0_2_0_10"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5008,6 +5047,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5062,6 +5102,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -5080,7 +5121,13 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5124,6 +5171,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; @@ -5147,6 +5195,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5187,11 +5236,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5310,6 +5361,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5734,7 +5786,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5754,6 +5808,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -5951,6 +6006,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6016,6 +6072,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6040,7 +6097,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6051,6 +6110,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6113,6 +6173,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6378,6 +6439,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6535,6 +6597,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6821,6 +6884,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6887,6 +6951,8 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; + "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -7062,12 +7128,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7231,6 +7299,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7275,6 +7345,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7345,6 +7416,7 @@ self: super: { "twisty" = dontDistribute super."twisty"; "twitch" = dontDistribute super."twitch"; "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = doDistribute super."twitter-conduit_0_1_3"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; "tx" = dontDistribute super."tx"; "txt-sushi" = dontDistribute super."txt-sushi"; @@ -7421,6 +7493,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7447,6 +7520,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7513,6 +7587,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7563,6 +7638,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7793,6 +7869,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7850,6 +7927,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; @@ -7872,8 +7950,10 @@ self: super: { "yeganesh" = dontDistribute super."yeganesh"; "yeller" = dontDistribute super."yeller"; "yeshql" = dontDistribute super."yeshql"; + "yesod" = doDistribute super."yesod_1_4_2_1"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_13"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; @@ -7887,6 +7967,7 @@ self: super: { "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_20"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix new file mode 100644 index 0000000000000..d5dbd2eed589c --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix @@ -0,0 +1,8048 @@ +{ 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-5.12 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"; + "AFSM" = dontDistribute super."AFSM"; + "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"; + "BiobaseNewick" = dontDistribute super."BiobaseNewick"; + "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"; + "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = dontDistribute super."Chart-diagrams"; + "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"; + "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"; + "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_10_1_0"; + "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"; + "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"; + "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"; + "ForestStructures" = dontDistribute super."ForestStructures"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "FractalArt" = dontDistribute super."FractalArt"; + "Fractaler" = dontDistribute super."Fractaler"; + "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-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "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"; + "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"; + "Gifcurry" = dontDistribute super."Gifcurry"; + "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"; + "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-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "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"; + "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"; + "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"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hate" = dontDistribute super."Hate"; + "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"; + "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"; + "IOSpec" = dontDistribute super."IOSpec"; + "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"; + "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"; + "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"; + "LATS" = dontDistribute super."LATS"; + "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"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "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"; + "MASMGen" = dontDistribute super."MASMGen"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "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-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"; + "NumberTheory" = dontDistribute super."NumberTheory"; + "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"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OneTuple" = dontDistribute super."OneTuple"; + "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" = doDistribute super."OpenGL_3_0_0_1"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "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"; + "PUH-Project" = dontDistribute super."PUH-Project"; + "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"; + "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; + "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" = doDistribute super."RNAlien_1_0_0"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "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"; + "SVGFonts" = dontDistribute super."SVGFonts"; + "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"; + "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"; + "SimpleServer" = dontDistribute super."SimpleServer"; + "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-auth" = dontDistribute super."Spock-auth"; + "Spock-lucid" = dontDistribute super."Spock-lucid"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; + "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"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "Stream" = dontDistribute super."Stream"; + "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"; + "Tahin" = dontDistribute super."Tahin"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "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"; + "Verba" = dontDistribute super."Verba"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "Vulkan" = dontDistribute super."Vulkan"; + "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-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"; + "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-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-left-pad" = dontDistribute super."acme-left-pad"; + "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"; + "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"; + "adler32" = dontDistribute super."adler32"; + "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_9_0_1"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "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" = dontDistribute super."aeson-schema"; + "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"; + "ag-pictgen" = dontDistribute super."ag-pictgen"; + "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" = doDistribute super."airship_0_4_3_0"; + "aivika" = dontDistribute super."aivika"; + "aivika-branches" = dontDistribute super."aivika-branches"; + "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_1_3_7"; + "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_3_7"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_3_7"; + "amazonka-certificatemanager" = dontDistribute super."amazonka-certificatemanager"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_3_7"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_3_7"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_3_7"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_3_7"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_3_7"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_3_7"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_3_7"; + "amazonka-cloudwatch-events" = dontDistribute super."amazonka-cloudwatch-events"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_3_7"; + "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_3_7"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_3_7"; + "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_3_7"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_3_7"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_3_7"; + "amazonka-config" = doDistribute super."amazonka-config_1_3_7"; + "amazonka-core" = doDistribute super."amazonka-core_1_3_7"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_3_7"; + "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_3_7"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_3_7"; + "amazonka-dms" = dontDistribute super."amazonka-dms"; + "amazonka-ds" = doDistribute super."amazonka-ds_1_3_7"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_3_7"; + "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_3_7"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_1_3_7"; + "amazonka-ecr" = dontDistribute super."amazonka-ecr"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_1_3_7"; + "amazonka-efs" = doDistribute super."amazonka-efs_1_3_7"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_3_7"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_3_7"; + "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_3_7"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_3_7"; + "amazonka-elb" = doDistribute super."amazonka-elb_1_3_7"; + "amazonka-emr" = doDistribute super."amazonka-emr_1_3_7"; + "amazonka-gamelift" = dontDistribute super."amazonka-gamelift"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_1_3_7"; + "amazonka-iam" = doDistribute super."amazonka-iam_1_3_7"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_1_3_7"; + "amazonka-inspector" = doDistribute super."amazonka-inspector_1_3_7"; + "amazonka-iot" = doDistribute super."amazonka-iot_1_3_7"; + "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_3_7"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_3_7"; + "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_3_7"; + "amazonka-kms" = doDistribute super."amazonka-kms_1_3_7"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_1_3_7"; + "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_3_7"; + "amazonka-marketplace-metering" = dontDistribute super."amazonka-marketplace-metering"; + "amazonka-ml" = doDistribute super."amazonka-ml_1_3_7"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_3_7"; + "amazonka-rds" = doDistribute super."amazonka-rds_1_3_7"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_1_3_7"; + "amazonka-route53" = doDistribute super."amazonka-route53_1_3_7"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_3_7"; + "amazonka-s3" = doDistribute super."amazonka-s3_1_3_7"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_1_3_7"; + "amazonka-ses" = doDistribute super."amazonka-ses_1_3_7"; + "amazonka-sns" = doDistribute super."amazonka-sns_1_3_7"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_1_3_7"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_1_3_7"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_3_7"; + "amazonka-sts" = doDistribute super."amazonka-sts_1_3_7"; + "amazonka-support" = doDistribute super."amazonka-support_1_3_7"; + "amazonka-swf" = doDistribute super."amazonka-swf_1_3_7"; + "amazonka-test" = doDistribute super."amazonka-test_1_3_7"; + "amazonka-waf" = doDistribute super."amazonka-waf_1_3_7"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_3_7"; + "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"; + "annihilator" = dontDistribute super."annihilator"; + "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" = doDistribute super."apiary_1_4_5"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-http-client" = dontDistribute super."apiary-http-client"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "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"; + "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; + "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"; + "arena" = dontDistribute super."arena"; + "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; + "argon" = doDistribute super."argon_0_4_0_0"; + "argon2" = dontDistribute super."argon2"; + "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"; + "arrows" = dontDistribute super."arrows"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atndapi" = dontDistribute super."atndapi"; + "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"; + "atrans" = dontDistribute super."atrans"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "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" = doDistribute super."authenticate_1_3_3"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; + "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"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "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-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; + "base-prelude" = doDistribute super."base-prelude_0_1_21"; + "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"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beam" = dontDistribute super."beam"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "bench" = dontDistribute super."bench"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "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"; + "bibdb" = dontDistribute super."bibdb"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bighugethesaurus" = dontDistribute super."bighugethesaurus"; + "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"; + "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-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-tagged" = doDistribute super."binary-tagged_0_1_3_1"; + "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-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-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-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-wlc" = dontDistribute super."bindings-wlc"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; + "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "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-bytestring" = dontDistribute super."bits-bytestring"; + "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"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blatex" = dontDistribute super."blatex"; + "blaze" = dontDistribute super."blaze"; + "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" = dontDistribute super."bloodhound"; + "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; + "bond-haskell" = dontDistribute super."bond-haskell"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; + "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"; + "boombox" = dontDistribute super."boombox"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bower-json" = doDistribute super."bower-json_0_7_0_0"; + "bowntz" = dontDistribute super."bowntz"; + "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; + "brainfuck" = dontDistribute super."brainfuck"; + "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"; + "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-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"; + "buffer-pipe" = dontDistribute super."buffer-pipe"; + "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"; + "butterflies" = dontDistribute super."butterflies"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "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_27_1"; + "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-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-info" = dontDistribute super."cabal-info"; + "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-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" = doDistribute super."cacophony_0_4_0"; + "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"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camfort" = dontDistribute super."camfort"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; + "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; + "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"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "casr-logbook" = dontDistribute super."casr-logbook"; + "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"; + "category-traced" = dontDistribute super."category-traced"; + "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"; + "cerberus" = dontDistribute super."cerberus"; + "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" = doDistribute super."cgi_3001_2_2_3"; + "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"; + "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-highlight" = dontDistribute super."cheapskate-highlight"; + "cheapskate-lucid" = dontDistribute super."cheapskate-lucid"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; + "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"; + "chorale" = dontDistribute super."chorale"; + "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"; + "clarifai" = dontDistribute super."clarifai"; + "clash" = dontDistribute super."clash"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; + "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-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"; + "clock" = doDistribute super."clock_0_6_0_1"; + "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"; + "clumpiness" = dontDistribute super."clumpiness"; + "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"; + "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"; + "commander" = dontDistribute super."commander"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "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"; + "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"; + "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-extra" = dontDistribute super."concurrent-extra"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-rpc" = dontDistribute super."concurrent-rpc"; + "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"; + "cond" = dontDistribute super."cond"; + "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-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; + "conf" = dontDistribute super."conf"; + "config-manager" = dontDistribute super."config-manager"; + "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"; + "constraint-classes" = dontDistribute super."constraint-classes"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "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"; + "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"; + "cplex-hs" = dontDistribute super."cplex-hs"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; + "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"; + "craze" = dontDistribute super."craze"; + "crc" = dontDistribute super."crc"; + "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_2"; + "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"; + "cryptohash" = doDistribute super."cryptohash_0_11_6"; + "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; + "cryptonite" = doDistribute super."cryptonite_0_10"; + "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; + "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; + "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"; + "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"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "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"; + "danibot" = dontDistribute super."danibot"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "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-base" = dontDistribute super."data-base"; + "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-extra" = dontDistribute super."data-default-extra"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-embed" = dontDistribute super."data-embed"; + "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-json-token" = dontDistribute super."data-json-token"; + "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-result" = dontDistribute super."data-result"; + "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" = doDistribute super."dbmigrations_1_0"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; + "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-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "debug-time" = dontDistribute super."debug-time"; + "decepticons" = dontDistribute super."decepticons"; + "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"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delay" = dontDistribute super."delay"; + "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"; + "dependent-state" = dontDistribute super."dependent-state"; + "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-monoid" = dontDistribute super."derive-monoid"; + "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-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "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-reflex" = dontDistribute super."diagrams-reflex"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; + "dialog" = dontDistribute super."dialog"; + "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-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "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-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"; + "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discogs-haskell" = dontDistribute super."discogs-haskell"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; + "distributed-process" = doDistribute super."distributed-process_0_5_5_1"; + "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-ekg" = dontDistribute super."distributed-process-ekg"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; + "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"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "dixi" = doDistribute super."dixi_0_6_0_5"; + "djembe" = dontDistribute super."djembe"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; + "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"; + "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-parser" = dontDistribute super."dom-parser"; + "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" = doDistribute super."dotenv_0_1_0_9"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "dotnet-timespan" = dontDistribute super."dotnet-timespan"; + "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"; + "dpor" = dontDistribute super."dpor"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; + "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"; + "dynobud" = dontDistribute super."dynobud"; + "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"; + "edis" = dontDistribute super."edis"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "editpipe" = dontDistribute super."editpipe"; + "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"; + "eithers" = dontDistribute super."eithers"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "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"; + "elision" = dontDistribute super."elision"; + "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-growler" = dontDistribute super."engine-io-growler"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "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"; + "envelope" = dontDistribute super."envelope"; + "envparse" = dontDistribute super."envparse"; + "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"; + "eternal" = dontDistribute super."eternal"; + "ether" = doDistribute super."ether_0_3_1_1"; + "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" = doDistribute super."eventstore_0_10_0_2"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "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"; + "exception-mtl" = dontDistribute super."exception-mtl"; + "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"; + "existential" = dontDistribute super."existential"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-extended" = dontDistribute super."exp-extended"; + "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-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"; + "external-sort" = dontDistribute super."external-sort"; + "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"; + "fadno-braids" = dontDistribute super."fadno-braids"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "fake-type" = dontDistribute super."fake-type"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-logger" = doDistribute super."fast-logger_2_4_2"; + "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"; + "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"; + "fcache" = dontDistribute super."fcache"; + "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"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "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"; + "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-clumpiness" = dontDistribute super."find-clumpiness"; + "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"; + "fixfile" = dontDistribute super."fixfile"; + "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-demos" = dontDistribute super."fltkhs-demos"; + "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_6"; + "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"; + "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"; + "free-vl" = dontDistribute super."free-vl"; + "freekick2" = dontDistribute super."freekick2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresco-binding" = dontDistribute super."fresco-binding"; + "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"; + "frown" = dontDistribute super."frown"; + "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"; + "funcons-tools" = dontDistribute super."funcons-tools"; + "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"; + "gdo" = dontDistribute super."gdo"; + "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_9_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-xml" = dontDistribute super."generic-xml"; + "generics-sop-lens" = dontDistribute super."generics-sop-lens"; + "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-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-dump-tree" = dontDistribute super."ghc-dump-tree"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-options" = dontDistribute super."ghc-options"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-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-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"; + "ghcid" = doDistribute super."ghcid_0_5_1"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; + "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-girepository" = dontDistribute super."gi-girepository"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gst" = dontDistribute super."gi-gst"; + "gi-gstaudio" = dontDistribute super."gi-gstaudio"; + "gi-gstbase" = dontDistribute super."gi-gstbase"; + "gi-gstvideo" = dontDistribute super."gi-gstvideo"; + "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-poppler" = dontDistribute super."gi-poppler"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gi-webkit2" = dontDistribute super."gi-webkit2"; + "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "giphy-api" = dontDistribute super."giphy-api"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_6_20160114"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "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"; + "gitHUD" = dontDistribute super."gitHUD"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-utils" = dontDistribute super."github-utils"; + "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"; + "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goal-core" = dontDistribute super."goal-core"; + "goal-geometry" = dontDistribute super."goal-geometry"; + "goal-probability" = dontDistribute super."goal-probability"; + "goal-simulation" = dontDistribute super."goal-simulation"; + "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-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"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gore-and-ash" = dontDistribute super."gore-and-ash"; + "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor"; + "gore-and-ash-async" = dontDistribute super."gore-and-ash-async"; + "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo"; + "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw"; + "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging"; + "gore-and-ash-network" = dontDistribute super."gore-and-ash-network"; + "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl"; + "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; + "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-core" = doDistribute super."graph-core_0_2_2_0"; + "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"; + "grasp" = dontDistribute super."grasp"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "graylog" = dontDistribute super."graylog"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; + "grid" = dontDistribute super."grid"; + "gridfs" = dontDistribute super."gridfs"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groundhog-converters" = dontDistribute super."groundhog-converters"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "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"; + "guid" = dontDistribute super."guid"; + "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"; + "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"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "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"; + "hahp" = dontDistribute super."hahp"; + "haiji" = dontDistribute super."haiji"; + "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-filestore" = dontDistribute super."hakyll-filestore"; + "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"; + "handwriting" = dontDistribute super."handwriting"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; + "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-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-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "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"; + "hapstone" = dontDistribute super."hapstone"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "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"; + "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_2"; + "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-kubernetes" = dontDistribute super."haskell-kubernetes"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpfr" = dontDistribute super."haskell-mpfr"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-names" = dontDistribute super."haskell-names"; + "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"; + "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" = doDistribute super."hasql_0_19_6"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres" = dontDistribute super."hasql-postgres"; + "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-gapi" = dontDistribute super."haste-gapi"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "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-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"; + "hcoap" = dontDistribute super."hcoap"; + "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"; + "hdr-histogram" = dontDistribute super."hdr-histogram"; + "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"; + "helix" = dontDistribute super."helix"; + "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"; + "herf-time" = dontDistribute super."herf-time"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; + "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"; + "hesh" = dontDistribute super."hesh"; + "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"; + "hformat" = dontDistribute super."hformat"; + "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"; + "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"; + "hi3status" = dontDistribute super."hi3status"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hieraclus" = dontDistribute super."hieraclus"; + "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"; + "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" = doDistribute super."hint_0_4_3"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hip" = dontDistribute super."hip"; + "hipbot" = dontDistribute super."hipbot"; + "hipchat-hs" = dontDistribute super."hipchat-hs"; + "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"; + "hit-graph" = dontDistribute super."hit-graph"; + "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"; + "hkdf" = dontDistribute super."hkdf"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hleap" = dontDistribute super."hleap"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_31"; + "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-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-repa" = dontDistribute super."hmatrix-repa"; + "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"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; + "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-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hpdft" = dontDistribute super."hpdft"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_12"; + "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"; + "hscolour" = doDistribute super."hscolour_1_23"; + "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"; + "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"; + "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-storablevector" = dontDistribute super."hsndfile-storablevector"; + "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-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "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-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "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-wai" = doDistribute super."hspec-wai_0_6_5"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "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-xhtml" = dontDistribute super."hsx-xhtml"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "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-parse" = dontDistribute super."html-parse"; + "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-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; + "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-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-session" = dontDistribute super."http-client-session"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; + "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-kinder" = dontDistribute super."http-kinder"; + "http-kit" = dontDistribute super."http-kit"; + "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-response-decoder" = dontDistribute super."http-response-decoder"; + "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_4_5"; + "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"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; + "hw-succinct" = dontDistribute super."hw-succinct"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "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"; + "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"; + "hylogen" = dontDistribute super."hylogen"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzaif" = dontDistribute super."hzaif"; + "hzk" = dontDistribute super."hzk"; + "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"; + "ibus-hs" = dontDistribute super."ibus-hs"; + "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" = doDistribute super."ig_0_6_1"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "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"; + "imap" = dontDistribute super."imap"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl" = dontDistribute super."imperative-edsl"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-logging" = dontDistribute super."implicit-logging"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "impossible" = dontDistribute super."impossible"; + "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-win32" = dontDistribute super."inline-c-win32"; + "inquire" = dontDistribute super."inquire"; + "insert-ordered-containers" = dontDistribute super."insert-ordered-containers"; + "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"; + "interruptible" = dontDistribute super."interruptible"; + "interspersed" = dontDistribute super."interspersed"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; + "io-reactive" = dontDistribute super."io-reactive"; + "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"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; + "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"; + "irc-fun-types" = dontDistribute super."irc-fun-types"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iridium" = dontDistribute super."iridium"; + "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"; + "isohunt" = dontDistribute super."isohunt"; + "ispositive" = dontDistribute super."ispositive"; + "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-artifact" = dontDistribute super."ivory-artifact"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-eval" = dontDistribute super."ivory-eval"; + "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-serialize" = dontDistribute super."ivory-serialize"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "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-poker" = dontDistribute super."java-poker"; + "java-reflect" = dontDistribute super."java-reflect"; + "javaclass" = dontDistribute super."javaclass"; + "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"; + "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-ast" = dontDistribute super."json-ast"; + "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-b" = dontDistribute super."json-b"; + "json-encoder" = dontDistribute super."json-encoder"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-incremental-decoder" = dontDistribute super."json-incremental-decoder"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; + "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"; + "juandelacosa" = dontDistribute super."juandelacosa"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jump" = dontDistribute super."jump"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "jwt" = doDistribute super."jwt_0_6_0"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kanji" = dontDistribute super."kanji"; + "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"; + "katip" = dontDistribute super."katip"; + "katip-elasticsearch" = dontDistribute super."katip-elasticsearch"; + "katt" = dontDistribute super."katt"; + "kazura-queue" = dontDistribute super."kazura-queue"; + "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"; + "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" = dontDistribute super."lambdabot"; + "lambdabot-core" = dontDistribute super."lambdabot-core"; + "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; + "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; + "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; + "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; + "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; + "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; + "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; + "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-compiler" = dontDistribute super."lambdacube-compiler"; + "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-ir" = dontDistribute super."lambdacube-ir"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatex" = dontDistribute super."lambdatex"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; + "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" = doDistribute super."language-c_0_4_7"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = dontDistribute super."language-c-quote"; + "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-mixal" = dontDistribute super."language-mixal"; + "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" = doDistribute super."language-thrift_0_7_0_1"; + "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"; + "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"; + "lazysmallcheck" = dontDistribute super."lazysmallcheck"; + "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"; + "leancheck" = dontDistribute super."leancheck"; + "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-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "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"; + "lenz" = dontDistribute super."lenz"; + "lenz-template" = dontDistribute super."lenz-template"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lfst" = dontDistribute super."lfst"; + "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"; + "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"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxls" = dontDistribute super."libxls"; + "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-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal"; + "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"; + "lmonad" = dontDistribute super."lmonad"; + "lmonad-yesod" = dontDistribute super."lmonad-yesod"; + "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"; + "locked-poll" = dontDistribute super."locked-poll"; + "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-effect" = dontDistribute super."logging-effect"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logict-state" = dontDistribute super."logict-state"; + "logplex-parse" = dontDistribute super."logplex-parse"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "lol-apps" = dontDistribute super."lol-apps"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "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"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; + "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"; + "luis-client" = dontDistribute super."luis-client"; + "luka" = dontDistribute super."luka"; + "luminance" = doDistribute super."luminance_0_9_1_2"; + "luminance-samples" = doDistribute super."luminance-samples_0_9_1"; + "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"; + "macbeth-lib" = dontDistribute super."macbeth-lib"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; + "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"; + "mainland-pretty" = dontDistribute super."mainland-pretty"; + "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"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "mappy" = dontDistribute super."mappy"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "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-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"; + "matcher" = dontDistribute super."matcher"; + "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"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; + "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" = doDistribute super."megaparsec_4_3_0"; + "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"; + "memory" = doDistribute super."memory_0_11"; + "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-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_1"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_1"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_1"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_2"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midair" = dontDistribute super."midair"; + "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"; + "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"; + "mnist-idx" = dontDistribute super."mnist-idx"; + "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"; + "mohws" = dontDistribute super."mohws"; + "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-connect" = dontDistribute super."monad-connect"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; + "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-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"; + "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-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mondo" = dontDistribute super."mondo"; + "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_10_1_1"; + "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; + "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" = doDistribute super."morte_1_4_2"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mountpoints" = dontDistribute super."mountpoints"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "mrm" = dontDistribute super."mrm"; + "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"; + "mueval" = dontDistribute super."mueval"; + "mulang" = dontDistribute super."mulang"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "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"; + "murmur" = dontDistribute super."murmur"; + "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-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" = doDistribute super."mwc-probability_1_0_3"; + "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-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-erl" = dontDistribute super."nano-erl"; + "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"; + "nanovg" = dontDistribute super."nanovg"; + "nanq" = dontDistribute super."nanq"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "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-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-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-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-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nist-beacon" = dontDistribute super."nist-beacon"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "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"; + "nonempty-alternative" = dontDistribute super."nonempty-alternative"; + "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"; + "number-length" = dontDistribute super."number-length"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "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-ranges" = dontDistribute super."numeric-ranges"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype" = dontDistribute super."numtype"; + "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"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "objective" = doDistribute super."objective_1_0_5"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octane" = dontDistribute super."octane"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "oden-go-packages" = dontDistribute super."oden-go-packages"; + "oeis" = dontDistribute super."oeis"; + "off-simple" = dontDistribute super."off-simple"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "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"; + "operational-extra" = dontDistribute super."operational-extra"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "option" = dontDistribute super."option"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "optparse-generic" = dontDistribute super."optparse-generic"; + "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-statistic-tree" = dontDistribute super."order-statistic-tree"; + "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-conduit" = dontDistribute super."osm-conduit"; + "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"; + "overloaded-records" = dontDistribute super."overloaded-records"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "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"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc" = doDistribute super."pandoc_1_16_0_2"; + "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-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; + "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"; + "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"; + "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"; + "partage" = dontDistribute super."partage"; + "partial" = dontDistribute super."partial"; + "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"; + "path-io" = doDistribute super."path-io_0_2_0"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "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-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-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "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-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"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phoityne" = dontDistribute super."phoityne"; + "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"; + "pinchot" = doDistribute super."pinchot_0_6_0_0"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; + "pipes-bzip" = dontDistribute super."pipes-bzip"; + "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; + "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-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "plan-b" = dontDistribute super."plan-b"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; + "plivo" = dontDistribute super."plivo"; + "plot-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"; + "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"; + "poly-control" = dontDistribute super."poly-control"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; + "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"; + "pong-server" = dontDistribute super."pong-server"; + "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"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9"; + "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-query" = dontDistribute super."postgresql-query"; + "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"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "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"; + "primitive-simd" = dontDistribute super."primitive-simd"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printf-safe" = dontDistribute super."printf-safe"; + "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-extras" = doDistribute super."process-extras_0_3_3_7"; + "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"; + "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1"; + "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"; + "prometheus" = dontDistribute super."prometheus"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "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-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxied" = dontDistribute super."proxied"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = doDistribute super."psc-ide_0_5_0"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; + "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-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" = doDistribute super."purescript_0_7_6_1"; + "purescript-bridge" = dontDistribute super."purescript-bridge"; + "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"; + "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"; + "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"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; + "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-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-binary" = dontDistribute super."quiver-binary"; + "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-groups" = dontDistribute super."quiver-groups"; + "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; + "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; + "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" = doDistribute super."rainbow_0_26_0_6"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_4"; + "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-tree" = dontDistribute super."random-tree"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rascal" = dontDistribute super."rascal"; + "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratel" = dontDistribute super."ratel"; + "ratel-wai" = dontDistribute super."ratel-wai"; + "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"; + "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server"; + "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-sdl2" = dontDistribute super."reactive-banana-sdl2"; + "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"; + "reactivity" = dontDistribute super."reactivity"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; + "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"; + "rebase" = dontDistribute super."rebase"; + "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"; + "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-io" = doDistribute super."redis-io_0_5_2"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-resp" = doDistribute super."redis-resp_0_3_2"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "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-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-orphans" = dontDistribute super."reflex-orphans"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "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-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-type" = dontDistribute super."regex-type"; + "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"; + "register-machine-typelevel" = dontDistribute super."register-machine-typelevel"; + "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"; + "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"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; + "remote-monad" = dontDistribute super."remote-monad"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "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-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"; + "reqcatcher" = dontDistribute super."reqcatcher"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "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_37"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-arguments" = dontDistribute super."reverse-arguments"; + "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" = doDistribute super."riak_0_9_1_1"; + "riak-protobuf" = doDistribute super."riak-protobuf_0_20_0_0"; + "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"; + "rlist" = dontDistribute super."rlist"; + "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-trie" = dontDistribute super."rose-trie"; + "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"; + "rss-conduit" = dontDistribute super."rss-conduit"; + "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"; + "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"; + "sampling" = dontDistribute super."sampling"; + "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"; + "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; + "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"; + "scalpel" = doDistribute super."scalpel_0_2_1_1"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scanner" = dontDistribute super."scanner"; + "scanner-attoparsec" = dontDistribute super."scanner-attoparsec"; + "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" = doDistribute super."scotty_0_10_2"; + "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-params-parser" = dontDistribute super."scotty-params-parser"; + "scotty-resource" = dontDistribute super."scotty-resource"; + "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"; + "scrape-changes" = dontDistribute super."scrape-changes"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "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_7_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-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"; + "sensei" = dontDistribute super."sensei"; + "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"; + "serv" = dontDistribute super."serv"; + "serv-wai" = dontDistribute super."serv-wai"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-elm" = dontDistribute super."servant-elm"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-foreign" = dontDistribute super."servant-foreign"; + "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; + "servant-js" = dontDistribute super."servant-js"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pandoc" = dontDistribute super."servant-pandoc"; + "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" = doDistribute super."servant-swagger_0_1_2"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-extra" = doDistribute super."set-extra_1_3_2"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; + "setops" = dontDistribute super."setops"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-grammar" = dontDistribute super."sexp-grammar"; + "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-language-c" = doDistribute super."shake-language-c_0_8_6"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shake-persist" = dontDistribute super."shake-persist"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; + "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"; + "show" = dontDistribute super."show"; + "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"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "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-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "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"; + "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"; + "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; + "skulk" = dontDistribute super."skulk"; + "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"; + "sleep" = dontDistribute super."sleep"; + "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"; + "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"; + "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"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = doDistribute super."socket_0_5_3_1"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "socketson" = dontDistribute super."socketson"; + "soegtk" = dontDistribute super."soegtk"; + "solr" = dontDistribute super."solr"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "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"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_1_0_2"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; + "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-record" = dontDistribute super."state-record"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_7_0"; + "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-histogram" = dontDistribute super."streaming-histogram"; + "streaming-png" = dontDistribute super."streaming-png"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; + "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-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "string-typelits" = dontDistribute super."string-typelits"; + "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-http-streams" = doDistribute super."stripe-http-streams_2_0_2"; + "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"; + "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"; + "supplemented" = dontDistribute super."supplemented"; + "suspend" = dontDistribute super."suspend"; + "svg-builder" = dontDistribute super."svg-builder"; + "svg-tree" = doDistribute super."svg-tree_0_3_2"; + "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" = doDistribute super."swagger2_1_2_1"; + "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-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; + "sync" = dontDistribute super."sync"; + "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"; + "t-regex" = dontDistribute super."t-regex"; + "t3-client" = dontDistribute super."t3-client"; + "t3-game" = dontDistribute super."t3-game"; + "t3-server" = dontDistribute super."t3-server"; + "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-timers" = dontDistribute super."tagged-timers"; + "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"; + "task-distribution" = dontDistribute super."task-distribution"; + "taskpool" = dontDistribute super."taskpool"; + "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; + "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"; + "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"; + "telegram-api" = dontDistribute super."telegram-api"; + "teleport" = dontDistribute super."teleport"; + "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"; + "tempo" = dontDistribute super."tempo"; + "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_2"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; + "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-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "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"; + "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-region" = dontDistribute super."text-region"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "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"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "textual" = dontDistribute super."textual"; + "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-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6"; + "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-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"; + "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-cache" = dontDistribute super."time-cache"; + "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-out" = dontDistribute super."time-out"; + "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-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-clock" = dontDistribute super."timelike-clock"; + "timelike-time" = dontDistribute super."timelike-time"; + "timemap" = dontDistribute super."timemap"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinylog" = doDistribute super."tinylog_0_12_1"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "tiphys" = dontDistribute super."tiphys"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; + "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-alternative" = dontDistribute super."total-alternative"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; + "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-fun" = dontDistribute super."tree-fun"; + "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"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "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"; + "tslib" = dontDistribute super."tslib"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "tttool" = doDistribute super."tttool_1_5_1"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple" = dontDistribute super."tuple"; + "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"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "turtle-options" = dontDistribute super."turtle-options"; + "tweak" = dontDistribute super."tweak"; + "twee" = dontDistribute super."twee"; + "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"; + "twentyseven" = dontDistribute super."twentyseven"; + "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" = doDistribute super."twitter-conduit_0_1_3"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "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-booleans" = dontDistribute super."type-booleans"; + "type-cache" = dontDistribute super."type-cache"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-natural" = dontDistribute super."type-natural"; + "type-operators" = dontDistribute super."type-operators"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "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"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; + "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; + "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-show" = dontDistribute super."unicode-show"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union" = dontDistribute super."union"; + "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"; + "unit-constraint" = dontDistribute super."unit-constraint"; + "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-th" = dontDistribute super."universe-th"; + "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"; + "unlambda" = dontDistribute super."unlambda"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1"; + "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"; + "unsequential" = dontDistribute super."unsequential"; + "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_2"; + "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"; + "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"; + "users" = doDistribute super."users_0_4_0_0"; + "users-persistent" = doDistribute super."users-persistent_0_4_0_0"; + "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0"; + "users-test" = doDistribute super."users-test_0_4_0_0"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; + "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-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"; + "validated-literals" = dontDistribute super."validated-literals"; + "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-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" = doDistribute super."vector-fftw_0_1_3_5"; + "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-sized" = dontDistribute super."vector-sized"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-space-points" = dontDistribute super."vector-space-points"; + "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-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-plus" = dontDistribute super."vinyl-plus"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; + "virthualenv" = dontDistribute super."virthualenv"; + "visibility" = dontDistribute super."visibility"; + "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"; + "vrpn" = dontDistribute super."vrpn"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "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"; + "vulkan" = dontDistribute super."vulkan"; + "wacom-daemon" = dontDistribute super."wacom-daemon"; + "waddle" = dontDistribute super."waddle"; + "wai-accept-language" = dontDistribute super."wai-accept-language"; + "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-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "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-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "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"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_2_2"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "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-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-transformers" = dontDistribute super."web-routes-transformers"; + "webapi" = dontDistribute super."webapi"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "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"; + "werewolf" = dontDistribute super."werewolf"; + "werewolf-slack" = dontDistribute super."werewolf-slack"; + "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"; + "with-location" = doDistribute super."with-location_0_0_0"; + "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"; + "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"; + "wsdl" = dontDistribute super."wsdl"; + "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"; + "xdcc" = dontDistribute super."xdcc"; + "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-tabular" = dontDistribute super."xlsx-tabular"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "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-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" = doDistribute super."yaml_0_8_16"; + "yaml-config" = dontDistribute super."yaml-config"; + "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"; + "yaml-union" = dontDistribute super."yaml-union"; + "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"; + "yeshql" = dontDistribute super."yeshql"; + "yesod" = doDistribute super."yesod_1_4_2_1"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_13"; + "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-oauth" = dontDistribute super."yesod-auth-oauth"; + "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-core" = doDistribute super."yesod-core_1_4_20"; + "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-form-richtext" = dontDistribute super."yesod-form-richtext"; + "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_5"; + "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-tableview" = dontDistribute super."yesod-tableview"; + "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-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "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"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; + "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" = doDistribute super."zim-parser_0_1_0_0"; + "zip" = dontDistribute super."zip"; + "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-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index 6bf2ccc526e0d..6cfa27dc5f57c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -336,6 +337,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -699,6 +701,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -868,6 +871,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1377,11 +1381,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1443,6 +1450,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_1"; @@ -2200,6 +2208,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2467,6 +2476,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2541,6 +2551,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -3181,6 +3192,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3240,6 +3252,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3399,6 +3412,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3486,6 +3500,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3976,6 +3991,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4308,6 +4324,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4321,6 +4338,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4328,6 +4346,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4372,6 +4392,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4532,6 +4553,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4782,6 +4805,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4843,6 +4867,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5084,7 +5109,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5128,6 +5155,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5183,6 +5211,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5205,8 +5234,10 @@ self: super: { "microformats2-types" = dontDistribute super."microformats2-types"; "microlens" = doDistribute super."microlens_0_4_1_0"; "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0"; "microlens-th" = doDistribute super."microlens-th_0_3_0_0"; "microtimer" = dontDistribute super."microtimer"; @@ -5252,6 +5283,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5276,6 +5308,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5323,6 +5356,7 @@ self: super: { "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5442,6 +5476,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5881,8 +5916,10 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -6101,6 +6138,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6167,6 +6205,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6191,7 +6230,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6202,6 +6243,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6265,6 +6307,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6534,6 +6577,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6698,6 +6742,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -7058,6 +7103,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7241,12 +7287,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7412,6 +7460,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7457,6 +7507,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7608,6 +7659,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7634,6 +7686,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7701,6 +7754,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7755,6 +7809,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index 7c359ae979b21..63f0dd7e6e0df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -696,6 +698,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -865,6 +868,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1373,11 +1377,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1439,6 +1446,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_1"; @@ -1511,6 +1519,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1907,6 +1916,7 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_10"; "clash-lib" = doDistribute super."clash-lib_0_6_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_5"; "clash-verilog" = doDistribute super."clash-verilog_0_6_5"; @@ -2190,6 +2200,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2456,6 +2467,7 @@ self: super: { "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-solve" = doDistribute super."diagrams-solve_0_1"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2529,6 +2541,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2611,6 +2624,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3161,6 +3175,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3219,6 +3234,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3378,6 +3394,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3465,6 +3482,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3955,6 +3973,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4287,6 +4306,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4300,6 +4320,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4307,6 +4328,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4351,6 +4374,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4510,6 +4534,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4760,6 +4786,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4821,6 +4848,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5061,7 +5089,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5104,6 +5134,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5159,6 +5190,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5180,9 +5212,12 @@ self: super: { "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; "microlens" = doDistribute super."microlens_0_4_1_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5226,6 +5261,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5250,6 +5286,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5297,6 +5334,7 @@ self: super: { "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5416,6 +5454,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5854,8 +5893,10 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5875,6 +5916,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6073,6 +6115,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6138,6 +6181,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6162,7 +6206,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6173,6 +6219,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6236,6 +6283,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6502,6 +6550,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6666,6 +6715,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6955,6 +7005,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7021,6 +7072,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7204,12 +7256,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7375,6 +7429,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7420,6 +7476,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7571,6 +7628,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7597,6 +7655,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7664,6 +7723,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7717,6 +7777,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index 1eb6d9d934e74..0fa6ca7940701 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -695,6 +697,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -864,6 +867,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1371,11 +1375,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1437,6 +1444,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_1"; @@ -1509,6 +1517,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1905,6 +1914,7 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_10"; "clash-lib" = doDistribute super."clash-lib_0_6_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_5"; "clash-verilog" = doDistribute super."clash-verilog_0_6_5"; @@ -2186,6 +2196,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2448,6 +2459,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2520,6 +2532,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2601,6 +2614,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3148,6 +3162,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3206,6 +3221,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3365,6 +3381,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3452,6 +3469,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3941,6 +3959,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4270,6 +4289,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4283,6 +4303,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4290,6 +4311,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4334,6 +4357,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4493,6 +4517,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4743,6 +4769,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4804,6 +4831,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5042,7 +5070,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5085,6 +5115,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5140,6 +5171,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5160,7 +5192,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5204,6 +5242,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5228,6 +5267,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5268,11 +5308,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5391,6 +5433,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5826,7 +5869,9 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5846,6 +5891,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6044,6 +6090,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6109,6 +6156,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6133,7 +6181,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6144,6 +6194,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6206,6 +6257,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6472,6 +6524,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6636,6 +6689,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6925,6 +6979,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6991,6 +7046,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7173,12 +7229,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7344,6 +7402,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7389,6 +7449,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7539,6 +7600,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7565,6 +7627,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7632,6 +7695,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7685,6 +7749,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7983,6 +8048,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 170b4b23c8e48..0bcc38b47924c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -695,6 +697,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -864,6 +867,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1371,11 +1375,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1436,6 +1443,7 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-orphans" = doDistribute super."base-orphans_0_5_2"; @@ -1508,6 +1516,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1903,6 +1912,7 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_10"; "clash-lib" = doDistribute super."clash-lib_0_6_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_5"; "clash-verilog" = doDistribute super."clash-verilog_0_6_5"; @@ -2182,6 +2192,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2444,6 +2455,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2516,6 +2528,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2597,6 +2610,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3144,6 +3158,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3202,6 +3217,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3361,6 +3377,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3448,6 +3465,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3936,6 +3954,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4264,6 +4283,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4277,6 +4297,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4284,6 +4305,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4328,6 +4351,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4487,6 +4511,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4737,6 +4763,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4798,6 +4825,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5036,7 +5064,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5079,6 +5109,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5134,6 +5165,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5154,7 +5186,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5198,6 +5236,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5222,6 +5261,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5262,11 +5302,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5385,6 +5427,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5820,7 +5863,9 @@ self: super: { "pipeclip" = dontDistribute super."pipeclip"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5840,6 +5885,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6038,6 +6084,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6103,6 +6150,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6127,7 +6175,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6138,6 +6188,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6200,6 +6251,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6466,6 +6518,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6630,6 +6683,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6919,6 +6973,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6985,6 +7040,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; @@ -7167,12 +7223,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7338,6 +7396,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7383,6 +7443,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7533,6 +7594,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7559,6 +7621,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7625,6 +7688,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7678,6 +7742,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7974,6 +8039,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix index 054cffa604250..d9ee78123bfa0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -694,6 +696,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -863,6 +866,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1369,11 +1373,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1434,8 +1441,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1504,6 +1513,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1897,12 +1907,16 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_10"; "clash-lib" = doDistribute super."clash-lib_0_6_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_5"; "clash-verilog" = doDistribute super."clash-verilog_0_6_5"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_7"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2172,6 +2186,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2434,6 +2449,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2506,6 +2522,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2587,6 +2604,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3132,6 +3150,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3190,6 +3209,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3349,6 +3369,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3436,6 +3457,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3921,6 +3943,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4249,6 +4272,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4262,6 +4286,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4269,6 +4294,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4313,6 +4340,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4472,6 +4500,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4722,6 +4752,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4782,6 +4813,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5019,7 +5051,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5062,6 +5096,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5117,6 +5152,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_4"; @@ -5137,7 +5173,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5181,6 +5223,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5205,6 +5248,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5245,11 +5289,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5368,6 +5414,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5800,7 +5847,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5820,6 +5869,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6018,6 +6068,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6083,6 +6134,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6107,7 +6159,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6118,6 +6172,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6180,6 +6235,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6445,6 +6501,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6609,6 +6666,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6898,6 +6956,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6964,6 +7023,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; @@ -7145,12 +7205,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7316,6 +7378,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7360,6 +7424,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7510,6 +7575,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7536,6 +7602,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7602,6 +7669,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7655,6 +7723,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7891,6 +7960,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7948,6 +8018,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix index 573e6d4d2a184..359afac3ca838 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -694,6 +696,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -863,6 +866,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1369,11 +1373,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1434,8 +1441,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1504,6 +1513,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1896,10 +1906,14 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_11"; "clash-lib" = doDistribute super."clash-lib_0_6_11"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2168,6 +2182,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2430,6 +2445,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2502,6 +2518,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2583,6 +2600,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3128,6 +3146,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3186,6 +3205,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3345,6 +3365,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3432,6 +3453,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3916,6 +3938,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4243,6 +4266,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4256,6 +4280,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4263,6 +4288,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4307,6 +4334,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4466,6 +4494,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4716,6 +4746,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4776,6 +4807,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5013,7 +5045,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5056,6 +5090,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5111,6 +5146,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -5130,7 +5166,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5174,6 +5216,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5198,6 +5241,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5238,11 +5282,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5361,6 +5407,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5790,7 +5837,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5810,6 +5859,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6008,6 +6058,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6073,6 +6124,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6097,7 +6149,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6108,6 +6162,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6170,6 +6225,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6435,6 +6491,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6598,6 +6655,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6887,6 +6945,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6953,6 +7012,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; @@ -7132,12 +7192,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7303,6 +7365,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7347,6 +7411,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7496,6 +7561,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7522,6 +7588,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7588,6 +7655,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7641,6 +7709,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7877,6 +7946,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7934,6 +8004,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix index 33846a1f09417..82f403de3dcd7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -694,6 +696,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -863,6 +866,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1369,11 +1373,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1434,8 +1441,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1504,6 +1513,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1896,10 +1906,14 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_11"; "clash-lib" = doDistribute super."clash-lib_0_6_11"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2167,6 +2181,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2429,6 +2444,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2501,6 +2517,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2582,6 +2599,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3127,6 +3145,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3185,6 +3204,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3344,6 +3364,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3431,6 +3452,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3915,6 +3937,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4242,6 +4265,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4255,6 +4279,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4262,6 +4287,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4306,6 +4333,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4465,6 +4493,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4715,6 +4745,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4775,6 +4806,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -5012,7 +5044,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5055,6 +5089,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5110,6 +5145,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -5129,7 +5165,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_3"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5173,6 +5215,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5197,6 +5240,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5237,11 +5281,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5360,6 +5406,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5789,7 +5836,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5809,6 +5858,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -6007,6 +6057,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6072,6 +6123,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6096,7 +6148,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6107,6 +6161,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6169,6 +6224,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6434,6 +6490,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6597,6 +6654,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6886,6 +6944,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6952,6 +7011,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; @@ -7131,12 +7191,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7302,6 +7364,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7346,6 +7410,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7495,6 +7560,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7521,6 +7587,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7587,6 +7654,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7639,6 +7707,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7874,6 +7943,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7931,6 +8001,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix index f62ae9defa253..695213a886f66 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix @@ -55,6 +55,7 @@ self: super: { "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; "AES" = dontDistribute super."AES"; + "AFSM" = dontDistribute super."AFSM"; "AGI" = dontDistribute super."AGI"; "ALUT" = dontDistribute super."ALUT"; "AMI" = dontDistribute super."AMI"; @@ -334,6 +335,7 @@ self: super: { "GLHUI" = dontDistribute super."GLHUI"; "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUT" = doDistribute super."GLUT_2_7_0_6"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; @@ -694,6 +696,7 @@ self: super: { "OpenCL" = dontDistribute super."OpenCL"; "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = doDistribute super."OpenGL_3_0_0_1"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; @@ -863,6 +866,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_3"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1368,11 +1372,14 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_3"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; "authoring" = dontDistribute super."authoring"; "autoexporter" = dontDistribute super."autoexporter"; + "automitive-cse" = dontDistribute super."automitive-cse"; + "automotive-cse" = dontDistribute super."automotive-cse"; "autonix-deps" = dontDistribute super."autonix-deps"; "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; @@ -1433,8 +1440,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_9_0"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_5_3"; "base-prelude" = doDistribute super."base-prelude_0_1_21"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1503,6 +1512,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_1"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1892,9 +1902,16 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_16"; + "clash-lib" = doDistribute super."clash-lib_0_6_14"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_6"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_6"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_6"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_6"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -2162,6 +2179,7 @@ self: super: { "crypto-totp" = dontDistribute super."crypto-totp"; "cryptohash" = doDistribute super."cryptohash_0_11_6"; "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3"; + "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; "cryptonite" = doDistribute super."cryptonite_0_10"; "cryptonite-conduit" = dontDistribute super."cryptonite-conduit"; "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; @@ -2423,6 +2441,7 @@ self: super: { "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "diagrams-wx" = dontDistribute super."diagrams-wx"; "dialog" = dontDistribute super."dialog"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2495,6 +2514,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dns" = doDistribute super."dns_2_0_1"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2576,6 +2596,7 @@ self: super: { "dynamic-object" = dontDistribute super."dynamic-object"; "dynamic-plot" = dontDistribute super."dynamic-plot"; "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = doDistribute super."dynamic-state_0_2_1_0"; "dynobud" = dontDistribute super."dynobud"; "dywapitchtrack" = dontDistribute super."dywapitchtrack"; "dzen-utils" = dontDistribute super."dzen-utils"; @@ -3121,6 +3142,7 @@ self: super: { "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; @@ -3179,6 +3201,7 @@ self: super: { "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitter" = dontDistribute super."gitter"; + "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3338,6 +3361,7 @@ self: super: { "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; "gpah" = dontDistribute super."gpah"; "gpcsets" = dontDistribute super."gpcsets"; + "gpio" = dontDistribute super."gpio"; "gpolyline" = dontDistribute super."gpolyline"; "gps" = dontDistribute super."gps"; "gps2htmlReport" = dontDistribute super."gps2htmlReport"; @@ -3425,6 +3449,7 @@ self: super: { "gtksourceview3" = dontDistribute super."gtksourceview3"; "guarded-rewriting" = dontDistribute super."guarded-rewriting"; "guess-combinator" = dontDistribute super."guess-combinator"; + "guid" = dontDistribute super."guid"; "gulcii" = dontDistribute super."gulcii"; "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; "gyah-bin" = dontDistribute super."gyah-bin"; @@ -3770,6 +3795,7 @@ self: super: { "hdis86" = dontDistribute super."hdis86"; "hdiscount" = dontDistribute super."hdiscount"; "hdm" = dontDistribute super."hdm"; + "hdocs" = doDistribute super."hdocs_0_4_4_1"; "hdph" = dontDistribute super."hdph"; "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; @@ -3904,6 +3930,7 @@ self: super: { "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; "historian" = dontDistribute super."historian"; + "hit-graph" = dontDistribute super."hit-graph"; "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; @@ -4231,6 +4258,7 @@ self: super: { "html-entities" = dontDistribute super."html-entities"; "html-kure" = dontDistribute super."html-kure"; "html-minimalist" = dontDistribute super."html-minimalist"; + "html-parse" = dontDistribute super."html-parse"; "html-rules" = dontDistribute super."html-rules"; "html-tokenizer" = dontDistribute super."html-tokenizer"; "html-truncate" = dontDistribute super."html-truncate"; @@ -4244,6 +4272,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_27"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4251,6 +4280,8 @@ self: super: { "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; "http-client-session" = dontDistribute super."http-client-session"; "http-client-streams" = dontDistribute super."http-client-streams"; + "http-client-tls" = doDistribute super."http-client-tls_0_2_2"; + "http-conduit" = doDistribute super."http-conduit_2_1_8"; "http-conduit-browser" = dontDistribute super."http-conduit-browser"; "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; "http-encodings" = dontDistribute super."http-encodings"; @@ -4295,6 +4326,7 @@ self: super: { "hutton" = dontDistribute super."hutton"; "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; + "hw-bits" = dontDistribute super."hw-bits"; "hw-succinct" = dontDistribute super."hw-succinct"; "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; "hws" = dontDistribute super."hws"; @@ -4452,6 +4484,8 @@ self: super: { "intset" = dontDistribute super."intset"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; + "io-choice" = doDistribute super."io-choice_0_0_5"; + "io-machine" = dontDistribute super."io-machine"; "io-reactive" = dontDistribute super."io-reactive"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; @@ -4700,6 +4734,7 @@ self: super: { "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdaya-bus" = dontDistribute super."lambdaya-bus"; "lambdiff" = dontDistribute super."lambdiff"; "lame-tester" = dontDistribute super."lame-tester"; "language-asn1" = dontDistribute super."language-asn1"; @@ -4760,6 +4795,7 @@ self: super: { "ldif" = dontDistribute super."ldif"; "leaf" = dontDistribute super."leaf"; "leaky" = dontDistribute super."leaky"; + "leancheck" = dontDistribute super."leancheck"; "leankit-api" = dontDistribute super."leankit-api"; "leapseconds-announced" = dontDistribute super."leapseconds-announced"; "learn" = dontDistribute super."learn"; @@ -4997,7 +5033,9 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines-binary" = dontDistribute super."machines-binary"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_6"; "machines-io" = doDistribute super."machines-io_0_2_0_8"; + "machines-process" = doDistribute super."machines-process_0_2_0_4"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5040,6 +5078,7 @@ self: super: { "manifolds" = dontDistribute super."manifolds"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; + "markdown" = doDistribute super."markdown_0_1_13_2"; "markdown-kate" = dontDistribute super."markdown-kate"; "markdown-pap" = dontDistribute super."markdown-pap"; "markdown2svg" = dontDistribute super."markdown2svg"; @@ -5095,6 +5134,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memory" = doDistribute super."memory_0_11"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; "messente" = dontDistribute super."messente"; @@ -5114,7 +5154,13 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_4"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_2_0"; + "microlens-contra" = doDistribute super."microlens-contra_0_1_0_0"; "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_7_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_2_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_3_0_1"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; "midair" = dontDistribute super."midair"; @@ -5158,6 +5204,7 @@ self: super: { "mlist" = dontDistribute super."mlist"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; + "mnist-idx" = dontDistribute super."mnist-idx"; "moan" = dontDistribute super."moan"; "mockery" = doDistribute super."mockery_0_3_2"; "modbus-tcp" = dontDistribute super."modbus-tcp"; @@ -5182,6 +5229,7 @@ self: super: { "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; + "monad-hash" = dontDistribute super."monad-hash"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; @@ -5222,11 +5270,13 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_1_1"; "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"; + "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_3"; "monoidplus" = dontDistribute super."monoidplus"; "monoids" = dontDistribute super."monoids"; "monomorphic" = dontDistribute super."monomorphic"; @@ -5345,6 +5395,7 @@ self: super: { "nanomsg" = dontDistribute super."nanomsg"; "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; "nanoparsec" = dontDistribute super."nanoparsec"; + "nanovg" = dontDistribute super."nanovg"; "nanq" = dontDistribute super."nanq"; "narc" = dontDistribute super."narc"; "nat" = dontDistribute super."nat"; @@ -5770,7 +5821,9 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec" = doDistribute super."pipes-attoparsec_0_5_1_2"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-bytestring" = doDistribute super."pipes-bytestring_2_1_1"; "pipes-bzip" = dontDistribute super."pipes-bzip"; "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5790,6 +5843,7 @@ self: super: { "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-parse" = doDistribute super."pipes-parse_3_0_4"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; @@ -5988,6 +6042,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = dontDistribute super."protolude"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6053,6 +6108,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6077,7 +6133,9 @@ self: super: { "quiver-enumerator" = dontDistribute super."quiver-enumerator"; "quiver-groups" = dontDistribute super."quiver-groups"; "quiver-http" = dontDistribute super."quiver-http"; + "quiver-instances" = dontDistribute super."quiver-instances"; "quiver-interleave" = dontDistribute super."quiver-interleave"; + "quiver-sort" = dontDistribute super."quiver-sort"; "quoridor-hs" = dontDistribute super."quoridor-hs"; "qux" = dontDistribute super."qux"; "rabocsv2qif" = dontDistribute super."rabocsv2qif"; @@ -6088,6 +6146,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow" = doDistribute super."rainbow_0_26_0_6"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rainbox" = doDistribute super."rainbox_0_18_0_4"; "rake" = dontDistribute super."rake"; @@ -6150,6 +6209,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = dontDistribute super."read-env-var"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; @@ -6415,6 +6475,7 @@ self: super: { "samtools-iteratee" = dontDistribute super."samtools-iteratee"; "sandlib" = dontDistribute super."sandlib"; "sarasvati" = dontDistribute super."sarasvati"; + "sarsi" = dontDistribute super."sarsi"; "sasl" = dontDistribute super."sasl"; "sat" = dontDistribute super."sat"; "sat-micro-hs" = dontDistribute super."sat-micro-hs"; @@ -6572,6 +6633,7 @@ self: super: { "shady-graphics" = dontDistribute super."shady-graphics"; "shake-cabal-build" = dontDistribute super."shake-cabal-build"; "shake-extras" = dontDistribute super."shake-extras"; + "shake-language-c" = doDistribute super."shake-language-c_0_8_4"; "shake-minify" = dontDistribute super."shake-minify"; "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; @@ -6859,6 +6921,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6925,6 +6988,8 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming" = doDistribute super."streaming_0_1_4_0"; + "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -7102,12 +7167,14 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_11"; "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"; + "tempo" = dontDistribute super."tempo"; "tempodb" = dontDistribute super."tempodb"; "temporal-csound" = dontDistribute super."temporal-csound"; "temporal-media" = dontDistribute super."temporal-media"; @@ -7272,6 +7339,8 @@ self: super: { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_4"; + "tls-debug" = doDistribute super."tls-debug_0_4_1"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7316,6 +7385,7 @@ self: super: { "transformers-runnable" = dontDistribute super."transformers-runnable"; "transformers-supply" = dontDistribute super."transformers-supply"; "transient" = dontDistribute super."transient"; + "transient-universe" = dontDistribute super."transient-universe"; "translatable-intset" = dontDistribute super."translatable-intset"; "translate" = dontDistribute super."translate"; "travis" = dontDistribute super."travis"; @@ -7465,6 +7535,7 @@ self: super: { "unboxed-containers" = dontDistribute super."unboxed-containers"; "unbreak" = dontDistribute super."unbreak"; "unfoldable" = dontDistribute super."unfoldable"; + "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; "ungadtagger" = dontDistribute super."ungadtagger"; "uni-events" = dontDistribute super."uni-events"; "uni-graphs" = dontDistribute super."uni-graphs"; @@ -7491,6 +7562,7 @@ self: super: { "unique-logic-tf" = dontDistribute super."unique-logic-tf"; "uniqueid" = dontDistribute super."uniqueid"; "unit" = dontDistribute super."unit"; + "unit-constraint" = dontDistribute super."unit-constraint"; "units" = dontDistribute super."units"; "units-attoparsec" = dontDistribute super."units-attoparsec"; "units-defs" = dontDistribute super."units-defs"; @@ -7557,6 +7629,7 @@ self: super: { "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-parsinglib" = doDistribute super."uu-parsinglib_2_9_1"; "uu-tc" = dontDistribute super."uu-tc"; "uuagc" = dontDistribute super."uuagc"; "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; @@ -7609,6 +7682,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_5"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -7843,6 +7917,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_4"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7900,6 +7975,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_16"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix index f84ddbdefa450..4b31e77ca7bdf 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix @@ -324,7 +324,7 @@ }: mkDerivation { pname = "Cabal"; - version = "1.22.4.0"; + version = "1.22.8.0"; src = "${ghcjsBoot}/boot/cabal/Cabal"; doCheck = false; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8503807b26478..e3d25a1427f27 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -436,6 +436,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "AFSM" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "AFSM"; + version = "0.1.2.0"; + sha256 = "b2b8f50b4c0d8e270a2c8df396afd6bc7d4dbe0859d957907129718e37342004"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/PseudoPower/AFSM"; + description = "Arrowized functional state machines"; + license = stdenv.lib.licenses.mit; + }) {}; + "AGI" = callPackage ({ mkDerivation, base, mtl, network, parsec, random, syb, unix }: mkDerivation { @@ -1349,7 +1361,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; - xqilla = null;}; + inherit (pkgs) xqilla;}; "BerlekampAlgorithm" = callPackage ({ mkDerivation, base, besout }: @@ -3598,17 +3610,18 @@ self: { "ConcurrentUtils" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , crypto-random, cryptohash, network, parallel, process - , reexport-crypto-random, RSA, securemem, tagged + , crypto-random, cryptohash, list-extras, MonadRandom, monads-tf + , network, parallel, process, reexport-crypto-random, RSA + , securemem, tagged }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.4.2.0"; - sha256 = "e4f784b7e1ee2d47049029e402242b37ff3fcdfd47ed7c2f60fcb368b344bcaf"; + version = "0.4.4.0"; + sha256 = "bf952d335d069acf90a05cc3e99a390133a222e64b3d6d92a128c15b8b1f70ff"; libraryHaskellDepends = [ array base binary bytestring containers crypto-random cryptohash - network parallel process reexport-crypto-random RSA securemem - tagged + list-extras MonadRandom monads-tf network parallel process + reexport-crypto-random RSA securemem tagged ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; @@ -4353,6 +4366,7 @@ self: { ]; description = "Database Supported Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DSTM" = callPackage @@ -6837,7 +6851,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; - "GLUT" = callPackage + "GLUT_2_7_0_6" = callPackage ({ mkDerivation, array, base, bytestring, containers, freeglut , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers }: @@ -6857,6 +6871,29 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + + "GLUT" = callPackage + ({ mkDerivation, array, base, bytestring, containers, freeglut + , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers + }: + mkDerivation { + pname = "GLUT"; + version = "2.7.0.7"; + sha256 = "3a9f292f6a417c90f39065c7e0d441798b99276ccdd1c0f3feff50955b937c93"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers OpenGL StateVar transformers + ]; + librarySystemDepends = [ freeglut mesa ]; + executableHaskellDepends = [ + array base bytestring OpenGLRaw random + ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL Utility Toolkit"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; @@ -6867,13 +6904,12 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.8"; - sha256 = "2ceb807d97c1c599d26be80d4bae98321cdbd59cff3af0dd68d1daa27615c7d4"; + version = "0.9.0"; + sha256 = "45978efe489c938a0ddf1928a96c956550c08db2d388242a31f86014a2e16e61"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; - jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14492,16 +14528,14 @@ self: { }) {}; "NetSNMP" = callPackage - ({ mkDerivation, base, bytestring, HUnit, net_snmp, process - , utf8-string - }: + ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.0"; - sha256 = "682dd18c07012ff2ec7fddede94ae2b66f039b6ecb918f4e9f70bccf2b266dfc"; - libraryHaskellDepends = [ base bytestring utf8-string ]; + version = "0.3.2.1"; + sha256 = "b6a3643f67ce621f399aa0e68bcc63f8693efcd902996dd405fdb4bedff35f30"; + libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; - testHaskellDepends = [ base bytestring HUnit process utf8-string ]; + testHaskellDepends = [ base bytestring HUnit process ]; homepage = "https://github.com/ptek/netsnmp"; description = "Bindings for net-snmp's C API for clients"; license = stdenv.lib.licenses.bsd3; @@ -15108,8 +15142,8 @@ self: { }: mkDerivation { pname = "OpenAL"; - version = "1.7.0.3"; - sha256 = "c8051477b773efe58d72cde32a1f24734a01e8a161cfee278420f0757eca2ac6"; + version = "1.7.0.4"; + sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15240,7 +15274,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGL" = callPackage + "OpenGL_3_0_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName , OpenGLRaw, StateVar, text, transformers }: @@ -15255,6 +15289,24 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "OpenGL" = callPackage + ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName + , OpenGLRaw, StateVar, text, transformers + }: + mkDerivation { + pname = "OpenGL"; + version = "3.0.0.2"; + sha256 = "13ee4a24d7caad61d3b63146be6620b523bde5b79f223c291f9f25ae9fd9681a"; + libraryHaskellDepends = [ + base bytestring containers GLURaw ObjectName OpenGLRaw StateVar + text transformers + ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; @@ -16510,6 +16562,7 @@ self: { homepage = "http://github.com/tepf/QuickPlot#readme"; description = "Quick and easy data visualization with Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Quickson" = callPackage @@ -18952,7 +19005,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "StateVar" = callPackage + "StateVar_1_1_0_3" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -18962,6 +19015,19 @@ self: { homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "StateVar" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "StateVar"; + version = "1.1.0.4"; + sha256 = "7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7"; + libraryHaskellDepends = [ base stm transformers ]; + homepage = "https://github.com/haskell-opengl/StateVar"; + description = "State variables"; + license = stdenv.lib.licenses.bsd3; }) {}; "StateVar-transformer" = callPackage @@ -23459,15 +23525,15 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, edit-distance-vector - , hashable, mtl, optparse-applicative, QuickCheck - , quickcheck-instances, scientific, text, unordered-containers - , vector + ({ mkDerivation, aeson, base, bytestring, directory + , edit-distance-vector, filepath, Glob, hashable, hlint, mtl + , optparse-applicative, QuickCheck, quickcheck-instances + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "aeson-diff"; - version = "0.1.1.3"; - sha256 = "c178500a64e09d14f39af26ec5930a23de3c64dfa7b68a1f047e847834f6a895"; + version = "1.0.0.0"; + sha256 = "5ea558cd2825880fe162418a933077d457cc02eb2cb4bcef48b5b49bef6ca9b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23478,8 +23544,8 @@ self: { aeson base bytestring optparse-applicative text ]; testHaskellDepends = [ - aeson base QuickCheck quickcheck-instances text - unordered-containers vector + aeson base bytestring directory filepath Glob hlint QuickCheck + quickcheck-instances text unordered-containers vector ]; homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; @@ -34176,6 +34242,7 @@ self: { homepage = "https://github.com/fosskers/haskell-aur"; description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authenticate_1_3_2_10" = callPackage @@ -34222,7 +34289,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "authenticate" = callPackage + "authenticate_1_3_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types , monad-control, network-uri, resourcet, tagstream-conduit, text @@ -34241,6 +34308,28 @@ self: { homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "authenticate" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, containers, http-conduit, http-types + , monad-control, network-uri, resourcet, tagstream-conduit, text + , transformers, unordered-containers, xml-conduit + }: + mkDerivation { + pname = "authenticate"; + version = "1.3.3.1"; + sha256 = "652449f41b12a71f570fd84f53893f82e50b7d793a0724d349188ce19d623113"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring case-insensitive + conduit containers http-conduit http-types monad-control + network-uri resourcet tagstream-conduit text transformers + unordered-containers xml-conduit + ]; + homepage = "http://github.com/yesodweb/authenticate"; + description = "Authentication methods for Haskell web applications"; + license = stdenv.lib.licenses.mit; }) {}; "authenticate-kerberos" = callPackage @@ -34405,6 +34494,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "automitive-cse" = callPackage + ({ mkDerivation, base, bytestring, cereal, cryptonite, memory + , quickcheck-simple + }: + mkDerivation { + pname = "automitive-cse"; + version = "0.0.1.0"; + sha256 = "d383db093ae4ec27661b43e381049257d102892a3891de00b345565d87d15b8e"; + libraryHaskellDepends = [ + base bytestring cereal cryptonite memory + ]; + testHaskellDepends = [ + base bytestring cryptonite quickcheck-simple + ]; + description = "Automotive CSE emulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "automotive-cse" = callPackage + ({ mkDerivation, base, bytestring, cereal, cryptonite, memory + , quickcheck-simple + }: + mkDerivation { + pname = "automotive-cse"; + version = "0.0.1.1"; + sha256 = "d19d0458f01691d72d2a238dfbd925b02145e66c4a64f90dab665d038ed80915"; + libraryHaskellDepends = [ + base bytestring cereal cryptonite memory + ]; + testHaskellDepends = [ + base bytestring cryptonite quickcheck-simple + ]; + description = "Automotive CSE emulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "autonix-deps" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit , containers, errors, filepath, lens, libarchive-conduit, mtl @@ -36365,7 +36490,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-compat" = callPackage + "base-compat_0_9_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; @@ -36375,6 +36500,19 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.9.1"; + sha256 = "1033b48146b9ffcf4f7c75a321ea0b1525c1b662230f46c41957a1b501b6464a"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; }) {}; "base-generics" = callPackage @@ -36439,8 +36577,8 @@ self: { pname = "base-orphans"; version = "0.4.4"; sha256 = "f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42"; - revision = "1"; - editedCabalFile = "4f1dd28434e9bc39a1f6993e6659b4c80c121fe225c65e1d47fe590432308979"; + revision = "2"; + editedCabalFile = "cea63d78f15bb697f86c7e827de98d713e814c12371cad4f66bd05ed8d77bbea"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/haskell-compat/base-orphans#readme"; @@ -36505,7 +36643,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans" = callPackage + "base-orphans_0_5_3" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; @@ -36516,6 +36654,20 @@ self: { homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-orphans" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: + mkDerivation { + pname = "base-orphans"; + version = "0.5.4"; + sha256 = "04075283606b3633f4b0c72f849a6df1b0519421ad099d07d3e72de589056263"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/haskell-compat/base-orphans#readme"; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; }) {}; "base-prelude_0_1_6" = callPackage @@ -38640,7 +38792,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary-tagged" = callPackage + "binary-tagged_0_1_3_1" = callPackage ({ mkDerivation, aeson, array, base, bifunctors, binary , binary-orphans, bytestring, containers, generics-sop, hashable , quickcheck-instances, scientific, SHA, tagged, tasty @@ -38663,6 +38815,33 @@ self: { homepage = "https://github.com/phadej/binary-tagged#readme"; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "binary-tagged" = callPackage + ({ mkDerivation, aeson, array, base, bifunctors, binary + , binary-orphans, bytestring, containers, generics-sop, hashable + , nats, quickcheck-instances, scientific, semigroups, SHA, tagged + , tasty, tasty-quickcheck, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.1.4.0"; + sha256 = "dc25744ebd21f8a050341cd7c25c69f66734b2930aaad89b411cf68c28605671"; + libraryHaskellDepends = [ + aeson array base binary bytestring containers generics-sop hashable + nats scientific semigroups SHA tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base bifunctors binary binary-orphans bytestring + containers generics-sop hashable nats quickcheck-instances + scientific semigroups SHA tagged tasty tasty-quickcheck text time + unordered-containers vector + ]; + homepage = "https://github.com/phadej/binary-tagged#readme"; + description = "Tagged binary serialisation"; + license = stdenv.lib.licenses.bsd3; }) {}; "binary-typed" = callPackage @@ -39062,8 +39241,8 @@ self: { ({ mkDerivation, base, bindings-DSL, fluidsynth }: mkDerivation { pname = "bindings-fluidsynth"; - version = "0.1.1"; - sha256 = "e5a5e12faddacbaff1303850db6bc7165ac41c4ba1c375dc3f4bfa4876ff0513"; + version = "0.2.1"; + sha256 = "cd0fae6cac7914a5bd9e5f61179755b45cf5576ca9d1f72c04443c3cdfdc2fbe"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ fluidsynth ]; homepage = "http://github.com/bgamari/bindings-fluidsynth"; @@ -40711,8 +40890,8 @@ self: { }: mkDerivation { pname = "blatex"; - version = "0.1.0.7"; - sha256 = "1f6979e4bc113132b2dd1e840ccf1642f1649bca8f16708e13a26f2a45310aa8"; + version = "0.1.0.8"; + sha256 = "461a3fd0f9052a2eedbb635bcc5b45020ed78535c4be3bef02dced9192951cb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -43000,16 +43179,16 @@ self: { }) {}; "bus-pirate" = callPackage - ({ mkDerivation, base, bytestring, either, errors, serialport - , transformers + ({ mkDerivation, base, bytestring, errors, serialport, transformers }: mkDerivation { pname = "bus-pirate"; - version = "0.6.3"; - sha256 = "22db2acbd964175dce221dcff52e16ba346846c14e7772e20e320cde7798314a"; + version = "0.7.0"; + sha256 = "932b9ba9210db4b63ffa1ac58072718d0118ba69ccecb1000a540084ed38507f"; libraryHaskellDepends = [ - base bytestring either errors serialport transformers + base bytestring errors serialport transformers ]; + jailbreak = true; homepage = "http://www.github.com/bgamari/bus-pirate"; description = "Haskell interface to the Bus Pirate binary interface"; license = stdenv.lib.licenses.bsd3; @@ -43831,8 +44010,8 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.5"; - sha256 = "05f819da3766b2521e4408497858c8fc538065375749d1dbc4d80de77e7ecf5a"; + version = "0.2.6"; + sha256 = "2b0dae2d0576355a3310bffe5c11fe89fbaf1426edc89d0f4074455d6a9da53f"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -44383,8 +44562,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "cabal-dependency-licenses"; - version = "0.1.1.1"; - sha256 = "8dcedb4b61f137423acd48b857629fb3865d003f0d1bd1d62d1c4850eb2b7785"; + version = "0.1.1.2"; + sha256 = "87355a19bc2b02050a629607cb847a8e51064e614e23bd7dde9861f2518cb91c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45631,6 +45810,7 @@ self: { ]; description = "A tool to generate .ghci file from .cabal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal2nix" = callPackage @@ -48167,8 +48347,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.3.0.0"; - sha256 = "917d08354d9b613def8412fcb096d6adab62d62379a4f761c6cd3021d8bb644b"; + version = "3001.3.0.1"; + sha256 = "96859110c72904089d8b3ac5fe493ac6f47aeafd1b30ffd1efce649442cc4752"; libraryHaskellDepends = [ base bytestring containers exceptions mtl multipart network network-uri parsec time xhtml @@ -48418,10 +48598,9 @@ self: { ({ mkDerivation, base, Chart }: mkDerivation { pname = "chart-histogram"; - version = "1.0.0"; - sha256 = "85136b3ba2b6f3f2a84a45d4d00760065f0d325e40fb7e155ef3eab0d65a128c"; + version = "1.1"; + sha256 = "08900a6889b97a75cbcd94fc5ccc817dc63f5d30739ab2738611499d9841db69"; libraryHaskellDepends = [ base Chart ]; - jailbreak = true; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -48815,8 +48994,8 @@ self: { }: mkDerivation { pname = "chorale"; - version = "0.1.1"; - sha256 = "1b0fb54ed282ff0189cb55b230efd616edc70030fe3bd4a990194ea5d81eb6aa"; + version = "0.1.3"; + sha256 = "c8c1130d15e2c3a7ce9152b408eed3159ba0f05e3d04182a8dae8a56e445d301"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers HUnit ieee754 QuickCheck safe test-framework @@ -49884,7 +50063,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_6_16" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-extra @@ -49908,6 +50087,33 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra + , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl + , process, text, time, transformers, unbound-generics, unix + , unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.6.17"; + sha256 = "e5408c5357b9a9e49c42921a6e452ea9f3fa62da20259fe30233b8dfed30a229"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers deepseq + directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise + hashable haskeline lens mtl process text time transformers + unbound-generics unix unordered-containers + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib_0_5_10" = callPackage @@ -50121,7 +50327,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_6_14" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -50141,6 +50347,29 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.6.15"; + sha256 = "13d09203361c257d546ded9acdd5d3cdb98463325d56ca7071bc2c912eede417"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath hashable lens mtl + pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude_0_9_2" = callPackage @@ -50229,7 +50458,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-prelude_0_10_6" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens , QuickCheck, reflection, singletons, template-haskell, th-lift @@ -50247,6 +50476,27 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-prelude" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens + , QuickCheck, reflection, singletons, template-haskell, th-lift + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.10.7"; + sha256 = "49350ec527f9225cafdad7ba257b57889b49fcbfc59c23e1f39dd65734cb8a02"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-extra + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell th-lift + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -50710,7 +50960,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_6_10" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -50725,6 +50975,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.6.11"; + sha256 = "aad86d4cc39f4a232318b19a3d7c08e2e8d479de2474ab5ba46608b5734670a6"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -51074,7 +51342,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_6" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -51099,6 +51367,34 @@ self: { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude" = callPackage + ({ mkDerivation, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, dlist, enclosed-exceptions, exceptions + , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, transformers-base + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "0.12.7"; + sha256 = "5cfe226df2e4b8ec5e0d3e28f8d9042ba327810396c86a996f5c777acfc45f7f"; + libraryHaskellDepends = [ + base basic-prelude bifunctors bytestring chunked-data containers + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base + mono-traversable mtl mutable-containers primitive semigroups stm + text time time-locale-compat transformers transformers-base + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; }) {}; "classy-prelude-conduit_0_10_2" = callPackage @@ -51312,7 +51608,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-conduit" = callPackage + "classy-prelude-conduit_0_12_6" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -51328,6 +51624,29 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "conduit instances for classy-prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-conduit" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "0.12.7"; + sha256 = "2e20a981befe1c62b4845dfe2644761862f74bd94968809f95fcf8088596d3f0"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; license = stdenv.lib.licenses.mit; @@ -51522,7 +51841,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-yesod" = callPackage + "classy-prelude-yesod_0_12_6" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -51536,6 +51855,27 @@ self: { http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-yesod" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "0.12.7"; + sha256 = "29ec02b573b0cb0d0438fc24df09ce082e3138873b0b7541a1aa590df76b5302"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; @@ -52715,16 +53055,12 @@ self: { }) {}; "cndict" = callPackage - ({ mkDerivation, base, binary, bytestring, cassava, containers - , text, vector - }: + ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.7.1"; - sha256 = "fa8e41c031e0a60abb73b0b76b18ea1a470e0a1ff8eed357c0b3f424bed9106f"; - libraryHaskellDepends = [ - base binary bytestring cassava containers text vector - ]; + version = "0.7.3"; + sha256 = "80da1953813673d42dbfaaeb360c5a0d8146ec80e21c5ce6a678dc87f5ec265e"; + libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; @@ -55853,8 +56189,8 @@ self: { }: mkDerivation { pname = "config-manager"; - version = "0.2.0.0"; - sha256 = "006e454220f88f4f7d8ccb89abb9ce80ebd88fa75147100fdf76e76690a0863a"; + version = "0.3.0.0"; + sha256 = "22d805602714e700507a68c62b4ccc0bd57aa0bef739d0256f19a8d43230b5fc"; libraryHaskellDepends = [ base filepath parsec text time unordered-containers ]; @@ -57136,10 +57472,9 @@ self: { ({ mkDerivation, base-prelude }: mkDerivation { pname = "conversion"; - version = "1.2"; - sha256 = "d5f8b437aaa61bd414247a5a4f947eb6ee41929c1725b4874af30252fea022a9"; + version = "1.2.1"; + sha256 = "c97771da92f229886f1a3033253a63bb429244f06a7cd877bdd633b4e4b82108"; libraryHaskellDepends = [ base-prelude ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/conversion"; description = "Universal converter between values of different types"; license = stdenv.lib.licenses.mit; @@ -57149,10 +57484,9 @@ self: { ({ mkDerivation, base-prelude, bytestring, conversion }: mkDerivation { pname = "conversion-bytestring"; - version = "1.0.0.1"; - sha256 = "7e4c4264a8a9aa4fc3809411146257989404d50dfe4943bdddf063546e754bbf"; + version = "1.0.1"; + sha256 = "90e3a027b17282a83809b67cdffdf5b8fc181d2c6b0d1011a95bf25c05387079"; libraryHaskellDepends = [ base-prelude bytestring conversion ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/conversion-bytestring"; description = "\"Conversion\" instances for the \"bytestring\" library"; license = stdenv.lib.licenses.mit; @@ -57176,12 +57510,11 @@ self: { }: mkDerivation { pname = "conversion-text"; - version = "1.0.0.2"; - sha256 = "7e5d2cefc064804aace10e32232cc155a819ca2da341041b7d698bc4b904f248"; + version = "1.0.1"; + sha256 = "3069670a34b7bd114ec1aa6a16b0ff1b4323ed8107186ad5b77013efe26b9b59"; libraryHaskellDepends = [ base-prelude bytestring conversion conversion-bytestring text ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/conversion-text"; description = "\"Conversion\" instances for the \"text\" library"; license = stdenv.lib.licenses.mit; @@ -58700,6 +59033,7 @@ self: { homepage = "http://github.com/MichaelXavier/crc"; description = "Implements various Cyclic Redundancy Checks (CRC)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crc16" = callPackage @@ -59674,6 +60008,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptohash-sha256" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "cryptohash-sha256"; + version = "0.11.7.1"; + sha256 = "ac42b0d863dfd91e1b77f513d371f73e31cb93c1677130ff63a3bf20c41a8bc0"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/hvr/cryptohash-sha256"; + description = "Fast, pure and practical SHA-256 implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptol_2_2_1" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , containers, deepseq, directory, filepath, gitrev, GraphSCC, happy @@ -59910,8 +60261,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.13"; - sha256 = "cd8adffda8fa7daf2063d27b502d52a4509e22f5e33cca861ffbf2f32bb32ad4"; + version = "0.15"; + sha256 = "aed8fac2bbb87705e1836a27179f85169c559b95d39199aad974d795917ac403"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -60777,8 +61128,10 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.3.3"; - sha256 = "81d22b29f72c77c8a8ffb89e14801adbd6b7730c7f24d3c24a311c028b9b624a"; + version = "0.1.3.4"; + sha256 = "dc0d463fc4a2065a72aa3c14acb3b1e04cff5b0eaddf52dfc076db74dcf01698"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async attoparsec base binary blaze-builder bytestring conduit conduit-extra containers data-binary-ieee754 data-default @@ -60786,6 +61139,7 @@ self: { template-haskell text transformers xml-conduit xml-picklers xml-types ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ base binary bytestring mtl QuickCheck singletons tasty tasty-hunit tasty-quickcheck tasty-th text xml-hamlet @@ -67152,6 +67506,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-wx" = callPackage + ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, wx + , wxcore + }: + mkDerivation { + pname = "diagrams-wx"; + version = "0.1.1.0"; + sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cairo diagrams-cairo diagrams-lib wx wxcore + ]; + homepage = "https://github.com/spinda/diagrams-wx#readme"; + description = "Backend for rendering diagrams in wxWidgets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dialog" = callPackage ({ mkDerivation, base, bytestring, filepath, glib, gtk3 , open-browser, text, transformers, webkitgtk3 @@ -67342,15 +67714,14 @@ self: { }) {}; "digamma" = callPackage - ({ mkDerivation, base, polynomial }: + ({ mkDerivation, base, math-functions }: mkDerivation { pname = "digamma"; - version = "0.1"; - sha256 = "ed1a3072c3e59d2628d63e6df85cbaaef264e8392de744735aae1d10ec153262"; - libraryHaskellDepends = [ base polynomial ]; - jailbreak = true; + version = "1.0"; + sha256 = "c6f6be6d43892ad434ce4a99323e1364560690bf005b2c3232f74a774c96a684"; + libraryHaskellDepends = [ base math-functions ]; homepage = "https://github.com/bgamari/digamma"; - description = "A robust implementation of the digamma function"; + description = "A (deprecated) implementation of the digamma function"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69578,6 +69949,7 @@ self: { homepage = "https://github.com/liamoc/dixi"; description = "A wiki implemented with a firm theoretical foundation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djembe" = callPackage @@ -69750,7 +70122,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dns" = callPackage + "dns_2_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers, doctest, hspec , iproute, mtl, network, random, resourcet, word8 @@ -69772,6 +70144,31 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dns" = callPackage + ({ mkDerivation, attoparsec, base, binary, blaze-builder + , bytestring, conduit, conduit-extra, containers, doctest, hspec + , iproute, mtl, network, random, resourcet, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.2"; + sha256 = "2b1a10e548694c49fba436ad7014db38b393b37b697445ab96e6fac4dd28b55e"; + libraryHaskellDepends = [ + attoparsec base binary blaze-builder bytestring conduit + conduit-extra containers iproute mtl network random resourcet + ]; + testHaskellDepends = [ + attoparsec base binary blaze-builder bytestring conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet word8 + ]; + doCheck = false; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "dnscache" = callPackage @@ -71577,7 +71974,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dynamic-state" = callPackage + "dynamic-state_0_2_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, hashable , unordered-containers }: @@ -71590,6 +71987,22 @@ self: { ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dynamic-state" = callPackage + ({ mkDerivation, base, binary, bytestring, hashable + , unordered-containers + }: + mkDerivation { + pname = "dynamic-state"; + version = "0.2.2.0"; + sha256 = "48834fa08130e614764b8d675d0c98866c53425a4c50a0333d7ce21a7c1ac7cf"; + libraryHaskellDepends = [ + base binary bytestring hashable unordered-containers + ]; + description = "Optionally serializable dynamic state keyed by type"; + license = stdenv.lib.licenses.gpl2; }) {}; "dynobud" = callPackage @@ -74261,8 +74674,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.3.1"; - sha256 = "ea6dc6e6939e5f80d715ec084103c6b3ba55947ba75f22551ed52084830da736"; + version = "0.3.2"; + sha256 = "a1bed0ca630b07e634dca85a9770ea917866516bd456d8f5012435d512560156"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; homepage = "https://supki.github.io/envparse"; @@ -77293,7 +77706,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fast-logger" = callPackage + "fast-logger_2_4_2" = callPackage ({ mkDerivation, array, auto-update, base, bytestring , bytestring-builder, directory, filepath, hspec, text }: @@ -77308,6 +77721,24 @@ self: { testHaskellDepends = [ base bytestring directory hspec ]; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fast-logger" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring + , bytestring-builder, directory, filepath, hspec, text + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.3"; + sha256 = "f85ff0ee8ed3177a749ca9490c703c6f1e2d87191e98096183ae75aa4b9b21d2"; + libraryHaskellDepends = [ + array auto-update base bytestring bytestring-builder directory + filepath text + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; }) {}; "fast-math" = callPackage @@ -82914,7 +83345,7 @@ self: { homepage = "https://gitlab.com/queertypes/freer"; description = "Implementation of the Freer Monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freesect" = callPackage @@ -84726,8 +85157,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "generic-deriving"; - version = "1.10.4"; - sha256 = "42581dce497a8f7867f07465659098b8a3ef75e50bc7e5c6ce16341ca40fdbb0"; + version = "1.10.4.1"; + sha256 = "7223aa09e19e921bb9d36841052b6cba46f34055b83f0a16f3057f56b6a9f7a9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -85807,8 +86238,8 @@ self: { }: mkDerivation { pname = "ghc-imported-from"; - version = "0.3.0.4"; - sha256 = "ed2517109076ae499c2de8d999577a32b666063d99b48364adbf7de68f947341"; + version = "0.3.0.5"; + sha256 = "a086956072e42dc5b3e7d2b3247b7e32335ff9110adce47ac93e3029bfe0c1d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86747,6 +87178,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "ghcjs-hplay" = callPackage + ({ mkDerivation, base, containers, ghcjs-perch, mtl, transformers + , transient, transient-universe + }: + mkDerivation { + pname = "ghcjs-hplay"; + version = "0.2"; + sha256 = "26da808173d1d113fa4fc1270d8ee30c7d957e59dfe251d32f9fdb94ee6065ea"; + libraryHaskellDepends = [ + base containers ghcjs-perch mtl transformers transient + transient-universe + ]; + jailbreak = true; + homepage = "https://github.com/agocorona/hplayground"; + description = "monadic, reactive Formlets running in the Web browser"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-perch = null;}; + "ghcjs-websockets" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring, text }: @@ -87277,8 +87727,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.2.0.0"; - sha256 = "e88221b67e7d262da943bd3b16f5de061130201425e889ca949422bb7e301ff3"; + version = "0.2.3.0"; + sha256 = "7a1246cf8eb32cadf750fb2e8bee630eb1d814408ce17fd584fd09b308a88cbe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87825,8 +88275,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20160318"; - sha256 = "5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b"; + version = "6.20160412"; + sha256 = "6bbdabf279a7fd5252eed818018d546ed9326d5feb648e5573976b2d110f5406"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -88092,14 +88542,14 @@ self: { "git-vogue" = callPackage ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff - , directory, filepath, formatting, ghc-mod, haskell-src-exts, hlint - , hscolour, hspec, optparse-applicative, process, split, strict - , stylish-haskell, temporary, text, transformers, unix + , directory, filepath, formatting, ghc-mod, git, haskell-src-exts + , hlint, hscolour, hspec, optparse-applicative, process, split + , strict, stylish-haskell, temporary, text, transformers, unix }: mkDerivation { pname = "git-vogue"; - version = "0.2.1.0"; - sha256 = "cb42012a44e2b106963c3f4ee94dfbd5efba05715eda6753f9b4485e9a45bcd9"; + version = "0.2.1.1"; + sha256 = "b01a260ce29defca47ef49d29ea345fa97a9f65c6014b8a5a2e8ed4b3f4850d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88113,11 +88563,12 @@ self: { testHaskellDepends = [ base containers directory filepath hspec process temporary ]; - jailbreak = true; + testToolDepends = [ git ]; homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) git;}; "gitHUD" = callPackage ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit @@ -88815,6 +89266,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "givegif" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , errors, giphy-api, hspec, lens, network-uri, optparse-applicative + , text, transformers, wreq + }: + mkDerivation { + pname = "givegif"; + version = "1.0.0.0"; + sha256 = "7fb3016bf4451326113062b5890011c88cc03a6f2c247df244456b520699d01b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers giphy-api network-uri + optparse-applicative text + ]; + executableHaskellDepends = [ + base bytestring errors giphy-api lens network-uri + optparse-applicative text transformers wreq + ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers hspec lens network-uri + text + ]; + homepage = "http://github.com/passy/givegif#readme"; + description = "CLI Giphy search tool with previews in iTerm 2"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gl_0_6_1" = callPackage ({ mkDerivation, base, containers, directory, filepath, fixed, half , hxt, mesa, split, transformers @@ -91540,6 +92019,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gpio" = callPackage + ({ mkDerivation, base, basic-prelude, monad-control + , optparse-generic, string-conversions + }: + mkDerivation { + pname = "gpio"; + version = "0.1.0.2"; + sha256 = "0b04f0cf97b096edf50770b0c20abc69823374ae8dbafbf696c42f13a5f2a576"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude monad-control string-conversions + ]; + executableHaskellDepends = [ + base basic-prelude optparse-generic string-conversions + ]; + homepage = "http://github.com/tgolson/gpio"; + description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gpolyline" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -94054,6 +94554,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "guid" = callPackage + ({ mkDerivation, base, bytestring, HUnit, text, uuid, uuid-types }: + mkDerivation { + pname = "guid"; + version = "0.1.0"; + sha256 = "b9dfaeffaaeb9e00f63a3af0e72e518231a93158c7e0ea0416cf62888af84eca"; + libraryHaskellDepends = [ base bytestring text uuid uuid-types ]; + testHaskellDepends = [ base HUnit ]; + description = "A simple wrapper around uuid"; + license = stdenv.lib.licenses.mit; + }) {}; + "gulcii" = callPackage ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { @@ -102274,8 +102786,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.19.9"; - sha256 = "68543bf70d4a4336b75194402240cfd2b5ce70c2deae07076af3dc98b5b76bf9"; + version = "0.19.10"; + sha256 = "e656386350fdba654177ac5efb96db00a7dd5e1675c710bf65bd75b0ed64b5dc"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -102798,8 +103310,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "0.4.4"; - sha256 = "b6a14cc3f4cbfdef648ccd8ad5ef1b5a1c58ba0fa7655aac62f54a6c36ad532f"; + version = "0.4.4.1"; + sha256 = "53ca58906d2a87549e59b5009d6865411fadc2cefa95af2283819980264aea4e"; libraryHaskellDepends = [ base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras either hasql mtl postgresql-error-codes @@ -104345,7 +104857,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdocs" = callPackage + "hdocs_0_4_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal , containers, filepath, ghc, ghc-paths, haddock-api , haddock-library, MonadCatchIO-transformers, mtl, network, process @@ -104370,6 +104882,34 @@ self: { homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hdocs" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , containers, filepath, ghc, ghc-paths, haddock-api + , haddock-library, MonadCatchIO-transformers, mtl, network, process + , text, transformers + }: + mkDerivation { + pname = "hdocs"; + version = "0.4.4.2"; + sha256 = "f732456170cbfbecb977395945217e6f95fd2b2d71e5f0ec8dd15daa9baeae58"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers filepath ghc ghc-paths + haddock-api haddock-library MonadCatchIO-transformers mtl network + process text transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath haddock-api + mtl network text + ]; + testHaskellDepends = [ base containers mtl ]; + homepage = "https://github.com/mvoidex/hdocs"; + description = "Haskell docs tool"; + license = stdenv.lib.licenses.bsd3; }) {}; "hdph" = callPackage @@ -107821,6 +108361,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hit-graph" = callPackage + ({ mkDerivation, base, containers, fgl, hashable, hit, transformers + , unordered-containers + }: + mkDerivation { + pname = "hit-graph"; + version = "0.1"; + sha256 = "90f144bb07dae291346186d7f10a697038176be3692b6d19abc60511cca32272"; + libraryHaskellDepends = [ + base containers fgl hashable hit transformers unordered-containers + ]; + homepage = "http://hub.darcs.net/fr33domlover/hit-graph"; + description = "Use graph algorithms to access and manipulate Git repos"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hjcase" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, test-framework , test-framework-hunit, text, unordered-containers, vector @@ -109737,13 +110293,12 @@ self: { ({ mkDerivation, base, hmatrix }: mkDerivation { pname = "hmatrix-svdlibc"; - version = "0.3.1"; - sha256 = "55466aaa04138feb5f8f9893be49d7e3e59b57251a576d25b6729118860d2456"; + version = "0.3.2"; + sha256 = "d1b8083fca23ff86953f66deabd7f5fbf5cd141b1048f55e531fcb1f66ef7bd3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix ]; executableHaskellDepends = [ base hmatrix ]; - jailbreak = true; homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; @@ -111316,15 +111871,14 @@ self: { }: mkDerivation { pname = "hoogle-index"; - version = "0.4.3"; - sha256 = "353175f271d6a4df1ad8434bb9b088bada47d8dfe2f624ed4f0d1c92c7d6c380"; + version = "0.4.4"; + sha256 = "bc18c8e83c50057dc7e62e795fdaca1a5225dc4324c4d7a5153a17b6202918c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal containers directory errors filepath hoogle optparse-applicative process temporary transformers ]; - jailbreak = true; homepage = "http://github.com/bgamari/hoogle-index"; description = "Easily generate Hoogle indices for installed packages"; license = stdenv.lib.licenses.bsd3; @@ -112085,12 +112639,12 @@ self: { "hpack" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers , deepseq, directory, filepath, Glob, hspec, interpolate, mockery - , temporary, text, unordered-containers, yaml + , QuickCheck, temporary, text, unordered-containers, yaml }: mkDerivation { pname = "hpack"; - version = "0.11.2"; - sha256 = "e44b9118ffd1ac4fda00b488f48b57e8fc7818ab784944f4c7835264408eb8d9"; + version = "0.12.0"; + sha256 = "564bdf6870efa6437d51d2bf05a09eafe61cb3bae33cc9c43a02fa094c868748"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112103,7 +112657,7 @@ self: { ]; testHaskellDepends = [ aeson aeson-qq base base-compat containers deepseq directory - filepath Glob hspec interpolate mockery temporary text + filepath Glob hspec interpolate mockery QuickCheck temporary text unordered-containers yaml ]; homepage = "https://github.com/sol/hpack#readme"; @@ -112695,15 +113249,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hprotoc_2_3_0" = callPackage + "hprotoc_2_3_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec , protocol-buffers, protocol-buffers-descriptor, utf8-string }: mkDerivation { pname = "hprotoc"; - version = "2.3.0"; - sha256 = "c6666c0407a10d8aaa6072b11d20b0829ab07eabb2c65c4e0ffcc1047c893a02"; + version = "2.3.1"; + sha256 = "e9d20e129681650635f2747af5751cea23886bcd33a9df0b15cf0c053602a2b8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114373,8 +114927,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.1.7.3"; - sha256 = "8da9d590ae0f43905acef2cf62f95b531409364bd7de2adc094092ce221f48b6"; + version = "0.1.8.2"; + sha256 = "0779ad320de31f59c6bae829398281697a25f45a3b38e1502cf1d005e1d5f9b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114388,9 +114942,9 @@ self: { transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers deepseq directory - exceptions filepath ghc haskell-src-exts lens monad-loops mtl - network optparse-applicative process text transformers + aeson aeson-pretty base bytestring containers data-default deepseq + directory exceptions filepath ghc haskell-src-exts lens monad-loops + mtl network optparse-applicative process text transformers unordered-containers vector ]; testHaskellDepends = [ @@ -117876,6 +118430,18 @@ self: { license = "GPL"; }) {}; + "html-parse" = callPackage + ({ mkDerivation, attoparsec, base, deepseq, text }: + mkDerivation { + pname = "html-parse"; + version = "0.1.0.0"; + sha256 = "077760e09e7ea180b786d6379b725419f9e892579a53d7469d1c09e48d7af000"; + libraryHaskellDepends = [ attoparsec base deepseq text ]; + homepage = "http://github.com/bgamari/html-parse"; + description = "A high-performance HTML tokenizer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "html-rules" = callPackage ({ mkDerivation, base, lens, mtl, tagsoup, transformers }: mkDerivation { @@ -118966,7 +119532,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_27" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -118994,6 +119560,37 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.27.1"; + sha256 = "e0c74065e7e138d8cbe477ba010c7bd352a7ffedd240d1ecaeee274d0ad0bde2"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; }) {}; "http-client-auth" = callPackage @@ -119126,7 +119723,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-client-tls" = callPackage + "http-client-tls_0_2_2" = callPackage ({ mkDerivation, base, bytestring, connection, data-default-class , hspec, http-client, http-types, network, tls }: @@ -119139,6 +119736,27 @@ self: { tls ]; testHaskellDepends = [ base hspec http-client http-types ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the connection package and tls library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client-tls" = callPackage + ({ mkDerivation, base, bytestring, connection, data-default-class + , hspec, http-client, http-types, network, tls + }: + mkDerivation { + pname = "http-client-tls"; + version = "0.2.3"; + sha256 = "7b2c7c2f3a68a2d8e069e1f5565b77ae8b8a9459e39b3ac5d5500705e2ff4f24"; + libraryHaskellDepends = [ + base bytestring connection data-default-class http-client network + tls + ]; + testHaskellDepends = [ base hspec http-client http-types ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; @@ -119290,7 +119908,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-conduit" = callPackage + "http-conduit_2_1_8" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , conduit, conduit-extra, connection, cookie, data-default-class , hspec, http-client, http-client-tls, http-types, HUnit @@ -119318,6 +119936,35 @@ self: { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-conduit" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, connection, cookie, data-default-class + , hspec, http-client, http-client-tls, http-types, HUnit + , lifted-base, monad-control, mtl, network, resourcet + , streaming-commons, text, time, transformers, utf8-string, wai + , wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.1.9"; + sha256 = "61a33fce3630b3a7b0740213cc1a4ab7b756103d629bc35d5fd9298bf66481cd"; + libraryHaskellDepends = [ + base bytestring conduit http-client http-client-tls http-types + lifted-base monad-control mtl resourcet transformers + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit lifted-base network streaming-commons + text time transformers utf8-string wai wai-conduit warp warp-tls + ]; + doCheck = false; + homepage = "http://www.yesodweb.com/book/http-conduit"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; }) {}; "http-conduit-browser" = callPackage @@ -120108,35 +120755,6 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, containers, directory, doctest, filepath - , Glob, hex, hspec, psqueues, stm, text, unordered-containers - , vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.5.4"; - sha256 = "f3851948d57fd532f37b1f74d2d975272ff7da218720b5f519765f1c274f257e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring bytestring-builder containers psqueues stm - ]; - executableHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - containers directory filepath hex text unordered-containers vector - word8 - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - containers directory doctest filepath Glob hex hspec psqueues stm - text unordered-containers vector word8 - ]; - description = "HTTP/2.0 library including frames and HPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http2_1_6_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory , doctest, filepath, Glob, hex, hspec, psqueues, stm, text , unordered-containers, vector, word8 @@ -120163,7 +120781,6 @@ self: { ]; description = "HTTP/2.0 library including frames and HPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "httpd-shed" = callPackage @@ -120664,8 +121281,8 @@ self: { }: mkDerivation { pname = "husk-scheme"; - version = "3.19.1"; - sha256 = "6441ed37323177d8f1c3855d4f7e1b11ad3cb998afd31f2571b4a0ac483c6b2c"; + version = "3.19.2"; + sha256 = "85bc2b974142778edbc354ef620fa0991b891aa5a0aaa36c1dd4ed8bd501fa63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120793,16 +121410,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hw-succinct" = callPackage + "hw-bits" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, conduit , criterion, deepseq, ghc-prim, hspec, lens, mmap, mono-traversable , parsec, QuickCheck, random, resourcet, safe, text, transformers , vector, word8 }: mkDerivation { - pname = "hw-succinct"; - version = "0.0.0.4"; - sha256 = "cbcec5f49f002108655ec5a75ef17d2d7361e24e778b9484d019a9433edbc3e8"; + pname = "hw-bits"; + version = "0.0.0.3"; + sha256 = "b83fc49f63fd604fb9232ca1cae1fcfea6ad0badef1e6ff0811bced810d9c728"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120817,6 +121434,35 @@ self: { attoparsec base bytestring conduit hspec mmap parsec QuickCheck resourcet transformers vector ]; + homepage = "http://github.com/haskell-works/hw-bits#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-succinct" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, conduit + , criterion, deepseq, ghc-prim, hspec, hw-bits, lens, mmap + , mono-traversable, parsec, QuickCheck, random, resourcet, safe + , text, transformers, vector, word8 + }: + mkDerivation { + pname = "hw-succinct"; + version = "0.0.0.5"; + sha256 = "b2b75ed9f82cabfa9ddb48b7fc4c76bb1bc3be5443fd1bfc6b25f334ca5563d7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array attoparsec base bytestring conduit deepseq ghc-prim hw-bits + lens mmap mono-traversable parsec QuickCheck random resourcet safe + text vector word8 + ]; + executableHaskellDepends = [ + base bytestring conduit criterion hw-bits mmap resourcet vector + ]; + testHaskellDepends = [ + attoparsec base bytestring conduit hspec hw-bits mmap parsec + QuickCheck resourcet transformers vector + ]; homepage = "http://github.com/haskell-works/hw-succinct#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; @@ -121858,21 +122504,21 @@ self: { "hylogen" = callPackage ({ mkDerivation, base, bytestring, filepath, hinotify, network - , process, random, text, websockets + , process, random, text, vector-space, websockets }: mkDerivation { pname = "hylogen"; - version = "0.1.0.5"; - sha256 = "59be04f1b9d6b6c84c77f16ebeb2d2a69624d76df1f270057c464c4cf40c6c93"; + version = "0.1.0.6"; + sha256 = "12ea64085fb2c7bb81311ec899e2ac5c24dcb92ec050ba2237baf9a86a7e6ed8"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base vector-space ]; executableHaskellDepends = [ base bytestring filepath hinotify network process random text websockets ]; homepage = "https://github.com/sleexyz/hylogen"; - description = "a tiny EDSL for live-coding fragment shaders"; + description = "an EDSL for live-coding fragment shaders"; license = stdenv.lib.licenses.mit; }) {}; @@ -123830,6 +124476,7 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Parsec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-plot" = callPackage @@ -124583,12 +125230,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "index-core"; - version = "1.0.2"; - sha256 = "bc51abd8393a83ab472adb545ae60366e55d6c72ea40484fd0816f55534e466a"; - revision = "1"; - editedCabalFile = "97808339bd2ac8a5c79ed99e716e2e8e941234421fde3930b370e0bbc734b063"; + version = "1.0.3"; + sha256 = "7d6d4964a83d04e796286fecc61750c211ec4003484672d43bd6d55c7711919c"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Indexed Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125646,6 +126290,7 @@ self: { homepage = "https://sealgram.com/git/haskell/interruptible/"; description = "Monad transformers that can be run and resumed later, conserving their context"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interspersed" = callPackage @@ -125869,7 +126514,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "io-choice" = callPackage + "io-choice_0_0_5" = callPackage ({ mkDerivation, base, hspec, lifted-base, monad-control , template-haskell, transformers, transformers-base }: @@ -125886,6 +126531,39 @@ self: { ]; description = "Choice for IO and lifted IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "io-choice" = callPackage + ({ mkDerivation, base, hspec, lifted-base, monad-control + , template-haskell, transformers, transformers-base + }: + mkDerivation { + pname = "io-choice"; + version = "0.0.6"; + sha256 = "612b281110d18615000704f24fdb54a3b4401f7a39dcfe358433d7b4c22e1cef"; + libraryHaskellDepends = [ + base lifted-base monad-control template-haskell transformers + transformers-base + ]; + testHaskellDepends = [ + base hspec lifted-base monad-control transformers + ]; + description = "Choice for IO and lifted IO"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "io-machine" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "io-machine"; + version = "0.2.0.0"; + sha256 = "05dcc8d5fcbb6f0d7f3519488ebf743eaa776bc93c2f8b0d4bbd866ac1331ccb"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/YoshikuniJujo/io-machine#readme"; + description = "Easy I/O model to learn IO monad"; + license = stdenv.lib.licenses.bsd3; }) {}; "io-manager" = callPackage @@ -126629,8 +127307,8 @@ self: { }: mkDerivation { pname = "irc-dcc"; - version = "1.1.0"; - sha256 = "4f33a7ae01f36638f5b7bcdbbf161f85f413ea68f76f8d5cd2ca3987028e1415"; + version = "1.2.0"; + sha256 = "8e01bddcbf8ab09ce2741942cdc45d7331d61afe03fdd9bcf677df5731a49256"; libraryHaskellDepends = [ attoparsec base binary bytestring errors io-streams iproute irc-ctcp network path transformers utf8-string @@ -127082,6 +127760,8 @@ self: { pname = "iteratee"; version = "0.8.9.6"; sha256 = "3760121c55677da5fef1b2d8e876f3b272d18e9ad5b3d1e8db5971b4307685f9"; + revision = "1"; + editedCabalFile = "e1131efd9c4dd62fa28d403381c498e652294254687b985fc6d26f5a9c7065d9"; libraryHaskellDepends = [ base bytestring containers exceptions ListLike monad-control parallel transformers transformers-base unix @@ -129849,8 +130529,8 @@ self: { }: mkDerivation { pname = "jwt"; - version = "0.7.0"; - sha256 = "a0eef3f59a4d115c47ffe75baa4f0347fc8fc714eac5fb258bdbeb42d501cff5"; + version = "0.7.1"; + sha256 = "41f8ec6f6871dcf0d2fc9824954d0c43dc4c3a142272d5e5cc642a6c57d658dc"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite data-default http-types memory network-uri scientific semigroups text time @@ -130052,13 +130732,13 @@ self: { ({ mkDerivation, base, bytestring, containers, microlens, text }: mkDerivation { pname = "kanji"; - version = "1.0.0"; - sha256 = "fbee1da853ed627eed6236a1c33086a8ce4ae541fe070aa5ca4c3847928d0c2a"; + version = "2.0.0"; + sha256 = "1547515b9f21d2b7ebd493770291d0a31905f957adb0a077b3846d935822053c"; libraryHaskellDepends = [ base bytestring containers microlens text ]; homepage = "https://github.com/fosskers/nanq"; - description = "Perform 漢字検定 (National Kanji Exam) level analysis on Japanese Kanji"; + description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -131876,6 +132556,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_0_3_0" = callPackage + ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec + , text + }: + mkDerivation { + pname = "lackey"; + version = "0.3.0"; + sha256 = "36f40425c39a7a214d5932b9f2c005335e61c2e95f2dc6fe4cf1172bf45d84c3"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base servant tasty tasty-hspec text ]; + jailbreak = true; + homepage = "https://github.com/tfausak/lackey#readme"; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -132609,6 +133306,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambdaya-bus" = callPackage + ({ mkDerivation, base, clash-prelude, Lambdaya, template-haskell }: + mkDerivation { + pname = "lambdaya-bus"; + version = "0.0.0.2"; + sha256 = "350df664157d067a7166cf620b24222ccfa09f761bb7e430705e19f58249a0f5"; + libraryHaskellDepends = [ + base clash-prelude Lambdaya template-haskell + ]; + description = "Fpga bus core and serialization for RedPitaya"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "lambdiff" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, enumerator, gtk, mtl @@ -133053,8 +133763,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.5"; - sha256 = "b939d141e1825338fdcc87a6155600a6f2cdaeb2e3d2379500a80bae4c783000"; + version = "0.11.6"; + sha256 = "db44ca0ff90af80ed915e60b471698c5f5b41ab562ed77ad68bcd912b7f82dc3"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -133068,6 +133778,7 @@ self: { homepage = "http://www.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-cil" = callPackage @@ -133098,11 +133809,13 @@ self: { ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { pname = "language-dot"; - version = "0.0.8"; - sha256 = "5d9dc8f2d3281888cdbf6435a55144a88b9473d36bbfe357e9806a564f755232"; + version = "0.0.9"; + sha256 = "e46a8fb501ba03548c9fa3df46f45c538abbaef1458f2d89e433b6ed44501d29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; + executableHaskellDepends = [ base mtl parsec pretty ]; + testHaskellDepends = [ base mtl parsec pretty ]; description = "A library for the analysis and creation of Graphviz DOT files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133763,13 +134476,12 @@ self: { ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { pname = "language-openscad"; - version = "0.1.6"; - sha256 = "592b393586fdecb03ca573f98794c7b78ec1836985e256e9d736769d15687c75"; + version = "0.1.7"; + sha256 = "2db783c05f3b846c65142e444ed291d1f5ad3ad3d6d3dc548b37f1c268319aa3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring ]; executableHaskellDepends = [ attoparsec base bytestring ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/language-openscad"; description = "A simple parser for OpenSCAD"; license = stdenv.lib.licenses.bsd3; @@ -134705,6 +135417,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "leancheck" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.3.0"; + sha256 = "e2e281abb06a21ea94bbf585156e5535baf45e1f79f26308b12d6d3eac1fb95d"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/rudymatela/leancheck#readme"; + description = "Cholesterol-free property-based testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -135155,6 +135880,8 @@ self: { pname = "lens-action"; version = "0.2.0.2"; sha256 = "e26c70b2de68a7cfbce97bcdabdcdfb45b2c50708207a14f8dd24c3e29c6d371"; + revision = "1"; + editedCabalFile = "a2f782186ca73d315a68a1e8430ae56ef4fd468237ab3d11b86a95efc41b18ae"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -137526,8 +138253,8 @@ self: { ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "linux-evdev"; - version = "0.3.1"; - sha256 = "60ae93f19740216028c633c2c94fdb876e791408c1853a885c6b664308a8a5ff"; + version = "0.3.2"; + sha256 = "39e9a49a171065c18d4d32738366a83d0360f35a4f0f878e515d4464375b5211"; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "http://github.com/bgamari/linux-evdev"; description = "Bindings to Linux evdev input device interface"; @@ -138687,14 +139414,13 @@ self: { }: mkDerivation { pname = "llvm-pkg-config"; - version = "0.0"; - sha256 = "dcf41d2b13c0b1af4c6f7d1d89f43e1bdf6c9603059e5a5155915bb80248dce9"; + version = "0.0.0.1"; + sha256 = "557be5a87569fe41ce009e4ed8ad49d4ab3f0c5cdf3239ce9dc8313790892f0a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal explicit-exception process transformers utility-ht ]; - jailbreak = true; description = "Generate Pkg-Config configuration file for LLVM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140882,6 +141608,7 @@ self: { homepage = "http://www.macbeth-ficsclient.com"; description = "Macbeth - A beautiful and minimalistic FICS client"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maccatcher" = callPackage @@ -140989,8 +141716,8 @@ self: { ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { pname = "machines-binary"; - version = "0.3.0.0"; - sha256 = "013b925cc53a804dcaf9d3b626c48c816513ed236940302c4274c3946141d58b"; + version = "0.3.0.2"; + sha256 = "c0c6c1a3869b3890d1b003a4adf4e91a5ae0921e775a9bfc126aa11bee663726"; libraryHaskellDepends = [ base binary bytestring machines ]; homepage = "http://github.com/aloiscochard/machines-binary"; description = "Binary utilities for the machines library"; @@ -141033,7 +141760,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "machines-directory" = callPackage + "machines-directory_0_2_0_6" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers }: @@ -141047,6 +141774,23 @@ self: { homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "machines-directory" = callPackage + ({ mkDerivation, base, directory, filepath, machines, machines-io + , transformers + }: + mkDerivation { + pname = "machines-directory"; + version = "0.2.0.8"; + sha256 = "65b712af8b3ecbd91618233e811170d9d7537982440005e3cc8e00284ecda4db"; + libraryHaskellDepends = [ + base directory filepath machines machines-io transformers + ]; + homepage = "http://github.com/aloiscochard/machines-directory"; + description = "Directory (system) utilities for the machines library"; + license = stdenv.lib.licenses.asl20; }) {}; "machines-io_0_2_0_0" = callPackage @@ -141119,7 +141863,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "machines-io" = callPackage + "machines-io_0_2_0_10" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers }: @@ -141133,6 +141877,23 @@ self: { homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "machines-io" = callPackage + ({ mkDerivation, base, bytestring, chunked-data, machines + , transformers + }: + mkDerivation { + pname = "machines-io"; + version = "0.2.0.12"; + sha256 = "375cf1c4529df84a085cb9c5d2625805e1d947cf4d444c3eeb66e7d0ffbd617d"; + libraryHaskellDepends = [ + base bytestring chunked-data machines transformers + ]; + homepage = "http://github.com/aloiscochard/machines-io"; + description = "IO utilities for the machines library"; + license = stdenv.lib.licenses.asl20; }) {}; "machines-process_0_2_0_0" = callPackage @@ -141169,7 +141930,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "machines-process" = callPackage + "machines-process_0_2_0_4" = callPackage ({ mkDerivation, base, chunked-data, machines, machines-io, process }: mkDerivation { @@ -141182,6 +141943,22 @@ self: { homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "machines-process" = callPackage + ({ mkDerivation, base, chunked-data, machines, machines-io, process + }: + mkDerivation { + pname = "machines-process"; + version = "0.2.0.6"; + sha256 = "2a51ffae469eda92ccd7a8d2d1301b0b756ec0c0672346b92572d58909a15831"; + libraryHaskellDepends = [ + base chunked-data machines machines-io process + ]; + homepage = "http://github.com/aloiscochard/machines-process"; + description = "Process (system) utilities for the machines library"; + license = stdenv.lib.licenses.asl20; }) {}; "machines-zlib" = callPackage @@ -142315,6 +143092,7 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifold-random" = callPackage @@ -142456,7 +143234,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "markdown" = callPackage + "markdown_0_1_13_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , conduit, conduit-extra, containers, data-default, directory , filepath, hspec, text, transformers, xss-sanitize @@ -142476,6 +143254,31 @@ self: { homepage = "https://github.com/snoyberg/markdown"; description = "Convert Markdown to HTML, with XSS protection"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "markdown" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , conduit, conduit-extra, containers, data-default, directory + , filepath, hspec, text, transformers, xml-conduit, xml-types + , xss-sanitize + }: + mkDerivation { + pname = "markdown"; + version = "0.1.14"; + sha256 = "204e9e0c100c8477266ab6b43990a5215ba07ac9ea280912794c32eef38dd42f"; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup conduit conduit-extra + containers data-default text transformers xml-conduit xml-types + xss-sanitize + ]; + testHaskellDepends = [ + base blaze-html conduit conduit-extra containers directory filepath + hspec text transformers + ]; + homepage = "https://github.com/snoyberg/markdown"; + description = "Convert Markdown to HTML, with XSS protection"; + license = stdenv.lib.licenses.bsd3; }) {}; "markdown-kate" = callPackage @@ -143911,7 +144714,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "memory" = callPackage + "memory_0_11" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck }: @@ -143924,6 +144727,22 @@ self: { homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "memory" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.12"; + sha256 = "e27e15cdfb41842ad1b6d68d5feb3c3ae041c0af1eb4dc997331e4c895162d1a"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; }) {}; "memscript" = callPackage @@ -144496,7 +145315,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens" = callPackage + "microlens_0_4_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; @@ -144506,6 +145325,32 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "A tiny part of the lens library with no dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens_0_4_2_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.2.1"; + sha256 = "774eae9dfe58bbbb42eb2696f9eaf9b549525c532f87f9629a1b0f7d7728d87e"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny part of the lens library with no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.3.0"; + sha256 = "c6476fa747094cc385a0aa369f705d3c5edbe5435e0e15d20dcb4ffa84443620"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny part of the lens library with no dependencies"; + license = stdenv.lib.licenses.bsd3; }) {}; "microlens-aeson_2_1_0" = callPackage @@ -144555,7 +145400,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "microlens-contra" = callPackage + "microlens-contra_0_1_0_0" = callPackage ({ mkDerivation, base, contravariant, microlens }: mkDerivation { pname = "microlens-contra"; @@ -144565,6 +145410,19 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "True folds and getters for microlens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-contra" = callPackage + ({ mkDerivation, base, contravariant, microlens }: + mkDerivation { + pname = "microlens-contra"; + version = "0.1.0.1"; + sha256 = "4983f19d37168a7cb862f76a22e8a43156df89c3c58b8206e2c84b2262c7f595"; + libraryHaskellDepends = [ base contravariant microlens ]; + homepage = "http://github.com/aelve/microlens"; + description = "True folds and getters for microlens"; + license = stdenv.lib.licenses.bsd3; }) {}; "microlens-each" = callPackage @@ -144630,7 +145488,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-ghc" = callPackage + "microlens-ghc_0_4_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: @@ -144641,6 +145499,42 @@ self: { libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; + jailbreak = true; + homepage = "http://github.com/aelve/microlens"; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-ghc_0_4_2_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.2.1"; + sha256 = "d75b714549fa634cc1d37003127d26cf16286cf18b903ba5bf004df16b853bb9"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + jailbreak = true; + homepage = "http://github.com/aelve/microlens"; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-ghc" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.3.0"; + sha256 = "f6ceaa3824742a8aa9659d01c3688997d72c0dedd74163147d0ee7744f62ede5"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; homepage = "http://github.com/aelve/microlens"; description = "microlens + array, bytestring, containers, transformers"; license = stdenv.lib.licenses.bsd3; @@ -144700,7 +145594,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-mtl" = callPackage + "microlens-mtl_0_1_7_0" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -144714,6 +145608,23 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-mtl" = callPackage + ({ mkDerivation, base, microlens, mtl, transformers + , transformers-compat + }: + mkDerivation { + pname = "microlens-mtl"; + version = "0.1.7.1"; + sha256 = "fe7d515a7562d936c8dd0a5c8ea2a1fbc9a5efc49170ef4809b484175e0f2556"; + libraryHaskellDepends = [ + base microlens mtl transformers transformers-compat + ]; + homepage = "http://github.com/aelve/microlens"; + description = "microlens support for Reader/Writer/State from mtl"; + license = stdenv.lib.licenses.bsd3; }) {}; "microlens-platform_0_1_7_0" = callPackage @@ -144754,7 +145665,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-platform" = callPackage + "microlens-platform_0_2_3_0" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -144766,6 +145677,44 @@ self: { base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector ]; + jailbreak = true; + homepage = "http://github.com/aelve/microlens"; + description = "Feature-complete microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-platform_0_2_3_1" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.2.3.1"; + sha256 = "b251a1e702bed97655c254de77dc4adaf71086b859f2d595c3be9190ae50c84b"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + jailbreak = true; + homepage = "http://github.com/aelve/microlens"; + description = "Feature-complete microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-platform" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.3.0.0"; + sha256 = "76c27befd899f86306e191b29b2f57afeb93eeaa91569ea7c80ad8a234b6ecc9"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; homepage = "http://github.com/aelve/microlens"; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; @@ -144838,7 +145787,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-th" = callPackage + "microlens-th_0_3_0_1" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; @@ -144850,6 +145799,36 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-th_0_3_0_2" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell }: + mkDerivation { + pname = "microlens-th"; + version = "0.3.0.2"; + sha256 = "0f002c49db5615e7c38cd913c70b11e1f70505f8b641d9a9919c63117fe75740"; + libraryHaskellDepends = [ + base containers microlens template-haskell + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-th" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.0.0"; + sha256 = "66972dfd673bce055e22487fde172471b50659125068438330d54732cfc2c1ce"; + libraryHaskellDepends = [ + base containers microlens template-haskell + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; }) {}; "microtimer" = callPackage @@ -145054,8 +146033,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.3.0"; - sha256 = "cc39bcd4a08a4ea71c9bfb11f5ab70a7aee91e927885cc88f7e71104fdc71966"; + version = "3.3.1"; + sha256 = "24d177cd77b9005901ab6c8aee0f3f0c4e286a9247561665b1d0b2fa8f0e84e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145948,6 +146927,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mnist-idx" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, hspec, vector + }: + mkDerivation { + pname = "mnist-idx"; + version = "0.1.2.3"; + sha256 = "10c7717cfa6955bc023a9a5be3692fc733ad0864d351a2b24e2a197ac10acecb"; + libraryHaskellDepends = [ base binary bytestring vector ]; + testHaskellDepends = [ base binary directory hspec vector ]; + jailbreak = true; + homepage = "https://github.com/kryoxide/mnist-idx/"; + description = "Read and write IDX data that is used in e.g. the MNIST database."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "moan" = callPackage ({ mkDerivation, base, binary, bytestring, containers, dawg , regex-tdfa, regex-tdfa-text, tagset-positional, text, zlib @@ -146315,19 +147309,19 @@ self: { "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network - , old-locale, old-time, parsec, process, transformers, unix - , utility-ht + , network-uri, old-locale, old-time, parsec, process, transformers + , unix, utility-ht }: mkDerivation { pname = "mohws"; - version = "0.2.1.3"; - sha256 = "8e631823f6cda806c8c54f63ba928803304c398a254f84707c439bc06c4145d9"; + version = "0.2.1.4"; + sha256 = "6d418e31959d24b436e89acf0c6b67a0e25a45ed5fb053d84c6ce3a4ae908fda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory - explicit-exception filepath html HTTP network old-locale old-time - parsec process transformers unix utility-ht + explicit-exception filepath html HTTP network network-uri + old-locale old-time parsec process transformers unix utility-ht ]; jailbreak = true; homepage = "http://code.haskell.org/mohws/"; @@ -146692,6 +147686,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-hash" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, exceptions, memory + , transformers + }: + mkDerivation { + pname = "monad-hash"; + version = "0.1"; + sha256 = "659cb349165bf1217552818c8a638f07b78f083b7f7961bca975348d78ea4392"; + libraryHaskellDepends = [ + base cryptonite exceptions memory transformers + ]; + testHaskellDepends = [ base bytestring cryptonite transformers ]; + homepage = "http://hub.darcs.net/fr33domlover/monad-hash"; + description = "Monad transformer for incremental hashing"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "monad-http" = callPackage ({ mkDerivation, base, base-compat, bytestring, exceptions , http-client, http-client-tls, http-types, monad-logger @@ -147932,6 +148943,7 @@ self: { jailbreak = true; description = "Haskell bindings for the Mondo API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongoDB_2_0_3" = callPackage @@ -148372,7 +149384,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mono-traversable" = callPackage + "mono-traversable_0_10_1_1" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, dlist , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck , semigroupoids, semigroups, split, text, transformers @@ -148394,6 +149406,31 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mono-traversable" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, dlist + , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck + , semigroupoids, semigroups, split, text, transformers + , unordered-containers, vector, vector-algorithms, vector-instances + }: + mkDerivation { + pname = "mono-traversable"; + version = "0.10.2"; + sha256 = "379ee5a7f9fc2a5c4fb11522fe28654d130c044265643122c8b3163e8e0452b8"; + libraryHaskellDepends = [ + base bytestring comonad containers dlist dlist-instances hashable + semigroupoids semigroups split text transformers + unordered-containers vector vector-algorithms vector-instances + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; }) {}; "monoid-absorbing" = callPackage @@ -148647,7 +149684,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monoidal-containers" = callPackage + "monoidal-containers_0_1_2_3" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype , unordered-containers }: @@ -148661,6 +149698,23 @@ self: { homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "monoidal-containers" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype + , unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.1.2.4"; + sha256 = "27bb6c90bbbddd60960f10cab33f79d807913a618c80bab1e6124985d4dd486d"; + libraryHaskellDepends = [ + base containers deepseq hashable lens newtype unordered-containers + ]; + homepage = "http://github.com/bgamari/monoidal-containers"; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; }) {}; "monoidplus" = callPackage @@ -149184,6 +150238,8 @@ self: { pname = "msgpack"; version = "1.0.0"; sha256 = "08f600b8428b27ee53f8f8cbd6c772603ecc80668c3e0801055083242cb6664e"; + revision = "1"; + editedCabalFile = "178ba2e6953c2c5a86905227ad6a248e7ea079f4fe1e2e823834defd5486e539"; libraryHaskellDepends = [ base binary blaze-builder bytestring containers data-binary-ieee754 deepseq hashable mtl text unordered-containers vector @@ -150100,6 +151156,7 @@ self: { homepage = "http://github.com/tokiwoousaka/murmur#readme"; description = "Simple CUI Twitter Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "murmur-hash" = callPackage @@ -151350,6 +152407,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nanovg" = callPackage + ({ mkDerivation, base, bytestring, containers, freeglut, gl, GLEW + , GLFW-b, hspec, inline-c, linear, mesa, monad-loops, QuickCheck + , text, transformers, vector + }: + mkDerivation { + pname = "nanovg"; + version = "0.2.0.0"; + sha256 = "5a594dea5114bea4be0951e6d0d9689996f10ac1e36ae8ae7dce51772a9765c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers linear text vector + ]; + librarySystemDepends = [ freeglut GLEW mesa ]; + executableHaskellDepends = [ + base containers gl GLFW-b linear monad-loops text transformers + vector + ]; + testHaskellDepends = [ + base containers hspec inline-c linear QuickCheck + ]; + homepage = "https://github.com/cocreature/nanovg-hs"; + description = "Haskell bindings for nanovg"; + license = stdenv.lib.licenses.isc; + }) {GLEW = null; inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + "nanq" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , extensible-effects, kanji, microlens, microlens-aeson @@ -151357,8 +152441,8 @@ self: { }: mkDerivation { pname = "nanq"; - version = "3.0.0"; - sha256 = "fd0ce6e40e6995521a97c0cbe13bd0260adfa21a76230f07cc17e299ca9c131c"; + version = "3.0.1"; + sha256 = "2d7680de6cb0d12d5960c3bf9eb1c9ed00092454f1ff9dac7dedd8aef365f2b5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151366,7 +152450,7 @@ self: { kanji microlens microlens-aeson optparse-applicative text ]; homepage = "https://github.com/fosskers/nanq"; - description = "Performs 漢字検定 (National Kanji Exam) level analysis on given Kanji"; + description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -155521,29 +156605,6 @@ self: { }) {}; "octane" = callPackage - ({ mkDerivation, base, binary, binary-bits, bytestring, containers - , data-binary-ieee754, deepseq, tasty, tasty-hspec, text - }: - mkDerivation { - pname = "octane"; - version = "0.4.10"; - sha256 = "140b33b6a11389da7eae39d4236c884dce9868bc870804bb55e2ab01fa10b859"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary binary-bits bytestring containers data-binary-ieee754 - deepseq text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base binary binary-bits bytestring containers tasty tasty-hspec - ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "octane_0_4_16" = callPackage ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary , binary-bits, bytestring, containers, data-binary-ieee754, deepseq , newtype-generics, tasty, tasty-hspec, text @@ -155565,7 +156626,6 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -159313,10 +160373,9 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.4.1"; - sha256 = "bd319f64abf3ebaac915e20135aadb06ab1f77ab562f7bac87580ceda37fc12d"; + version = "0.5"; + sha256 = "407c6098424879a1add6393c8f07266291fd28b4ada61366e5625736323a13fb"; libraryHaskellDepends = [ base containers lens pandoc-types ]; - jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -163771,6 +164830,7 @@ self: { homepage = "https://github.com/frasertweedale/hs-persona-idp"; description = "Persona (BrowserID) Identity Provider"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pesca" = callPackage @@ -164496,20 +165556,20 @@ self: { }) {}; "pinchot" = callPackage - ({ mkDerivation, base, containers, Earley, lens, template-haskell - , transformers + ({ mkDerivation, base, containers, Earley, lens, ListLike + , template-haskell, transformers }: mkDerivation { pname = "pinchot"; - version = "0.14.0.0"; - sha256 = "5b7ff31987e51ff69fe75b950ac3b4d27c4d7b530b15ea3f8057b314834aad10"; + version = "0.16.0.0"; + sha256 = "b0fef14a482caff2cb1e7985205ec914019996a75960fc1f937d2d8da18b15bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers Earley lens template-haskell transformers + base containers Earley lens ListLike template-haskell transformers ]; homepage = "http://www.github.com/massysett/pinchot"; - description = "Build parsers and ASTs for context-free grammars"; + description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -164771,7 +165831,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-attoparsec" = callPackage + "pipes-attoparsec_0_5_1_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, mmorph, pipes , pipes-parse, tasty, tasty-hunit, text, transformers }: @@ -164789,6 +165849,27 @@ self: { homepage = "https://github.com/k0001/pipes-attoparsec"; description = "Attoparsec and Pipes integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit, mmorph, pipes + , pipes-parse, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "pipes-attoparsec"; + version = "0.5.1.3"; + sha256 = "926402298cde53c2cb496833360e6cfaac7974c87015e9fcecf0922a1a687981"; + libraryHaskellDepends = [ + attoparsec base bytestring pipes pipes-parse text transformers + ]; + testHaskellDepends = [ + attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit + text transformers + ]; + homepage = "https://github.com/k0001/pipes-attoparsec"; + description = "Attoparsec and Pipes integration"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-attoparsec-streaming" = callPackage @@ -164896,7 +165977,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-bytestring" = callPackage + "pipes-bytestring_2_1_1" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , transformers }: @@ -164909,6 +165990,22 @@ self: { ]; description = "ByteString support for pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-bytestring" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse + , transformers + }: + mkDerivation { + pname = "pipes-bytestring"; + version = "2.1.2"; + sha256 = "61a49be65412fb7d0a418a28a904cfa0a888318403b1f813cf559805a3830b87"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse transformers + ]; + description = "ByteString support for pipes"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-bzip" = callPackage @@ -165513,7 +166610,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-parse" = callPackage + "pipes-parse_3_0_4" = callPackage ({ mkDerivation, base, pipes, transformers }: mkDerivation { pname = "pipes-parse"; @@ -165522,6 +166619,18 @@ self: { libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-parse" = callPackage + ({ mkDerivation, base, pipes, transformers }: + mkDerivation { + pname = "pipes-parse"; + version = "3.0.5"; + sha256 = "e56f2b4e49358be27163c5f78e0be8d67ee8948c50c37965d990ccf8a9dea87d"; + libraryHaskellDepends = [ base pipes transformers ]; + description = "Parsing infrastructure for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-postgresql-simple" = callPackage @@ -165699,18 +166808,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-transduce_0_3_4_0" = callPackage + "pipes-transduce_0_4" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest - , foldl, free, pipes, pipes-bytestring, pipes-concurrency - , pipes-group, pipes-parse, pipes-safe, pipes-text, tasty - , tasty-hunit, text, transformers, void + , foldl, free, microlens, pipes, pipes-bytestring + , pipes-concurrency, pipes-group, pipes-parse, pipes-safe + , pipes-text, tasty, tasty-hunit, text, transformers, void }: mkDerivation { pname = "pipes-transduce"; - version = "0.3.4.0"; - sha256 = "82c850ba718f4467e2742418249a584b1d3521815083a87cbe51543bc3486833"; + version = "0.4"; + sha256 = "984d8cf42d3614e87e2bd2178bbe04237d83b9385b3b39df32e2f8bc0e972c4f"; libraryHaskellDepends = [ - base bifunctors bytestring conceit foldl free pipes + base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse pipes-safe pipes-text text transformers void ]; @@ -167025,6 +168134,19 @@ self: { license = "LGPL"; }) {}; + "polyparse_1_12" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "polyparse"; + version = "1.12"; + sha256 = "f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15"; + libraryHaskellDepends = [ base bytestring text ]; + homepage = "http://code.haskell.org/~malcolm/polyparse/"; + description = "A variety of alternative parser combinator libraries"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -167822,8 +168944,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.8.1"; - sha256 = "e5745c009806fb10705f1f5f23c2af4028b47a7178e1ea09e102cf697cc2581b"; + version = "0.9"; + sha256 = "c90e1d73836450bece04672ee9a8ac0232aa431779498e1d554705382bc40b6d"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring foldl loch-th placeholders scientific text time transformers uuid vector @@ -167835,7 +168957,6 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; - jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; @@ -169742,8 +170863,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.1.0"; - sha256 = "cd1efb0a5a24a9b3c13fc24bba2054ae0be494b645a5091f733b06854a275a9c"; + version = "0.9.1.1"; + sha256 = "0d773c9c61232de9878a4d56f98e810932980309bde2e321e3a3007a8797d7c6"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -169758,7 +170879,6 @@ self: { semigroups tasty tasty-hunit text transformers transformers-compat void ]; - doCheck = false; description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -170733,14 +171853,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers_2_3_0" = callPackage + "protocol-buffers_2_3_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: mkDerivation { pname = "protocol-buffers"; - version = "2.3.0"; - sha256 = "46ace772d0bea68026a12c72d175f54f4fe4d63be0fcd806406c6b7b0c45fdad"; + version = "2.3.1"; + sha256 = "4cb6aee21144468d056c513d6cad8e822cf2b1b0da53277fb999683dd5665d43"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -170861,12 +171981,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers-descriptor_2_3_0" = callPackage + "protocol-buffers-descriptor_2_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.3.0"; - sha256 = "54a2ee0eedb1be7a5b9de25750b9f5aef021491081460acee444f07998dccdaf"; + version = "2.3.1"; + sha256 = "a6ec38f6641a10770404cf34280ec7769522aecba429fa36099334d3bc985bc7"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -170912,6 +172032,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "protolude" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , ghc-prim, mtl, safe, semiring-simple, stm, string-conv, text + , transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.1.2"; + sha256 = "c44cff763b5ec3c46fd5e624db6b46932f555968f4f5a43c0948e6d06600a920"; + libraryHaskellDepends = [ + async base bytestring containers deepseq ghc-prim mtl safe + semiring-simple stm string-conv text transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A sensible set of defaults for writing custom Preludes"; + license = stdenv.lib.licenses.mit; + }) {}; + "proton-haskell" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , test-framework, test-framework-hunit @@ -172731,6 +173869,17 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "quickcheck-combinators" = callPackage + ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: + mkDerivation { + pname = "quickcheck-combinators"; + version = "0.0.0"; + sha256 = "42fe67cfbab7c215b00e843b773fcee84e28f4ffdae5f43affa21331dcdcb2b5"; + libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; + description = "Simple type-level combinators for augmenting QuickCheck instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-instances_0_3_9" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , old-time, QuickCheck, text, time, unordered-containers @@ -173157,8 +174306,8 @@ self: { }: mkDerivation { pname = "quiver-binary"; - version = "0.1.0.0"; - sha256 = "9a13cd31c0bfe865f4660a00bb86f0b90fa88f1929d91bbd4160c509dd65a04d"; + version = "0.1.1.0"; + sha256 = "44e9190ce2a87135e85b98d6843ce74b15710537e7dd56524ecb731181fb162a"; libraryHaskellDepends = [ base binary bytestring quiver quiver-bytestring ]; @@ -173249,18 +174398,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quiver-instances" = callPackage + ({ mkDerivation, base, exceptions, quiver, resourcet, transformers + , transformers-base + }: + mkDerivation { + pname = "quiver-instances"; + version = "0.2.0.0"; + sha256 = "00acef0be95c1aad3a0cc56fa6281a794e9375ba25def925370b9bc77eecd90d"; + libraryHaskellDepends = [ + base exceptions quiver resourcet transformers transformers-base + ]; + description = "Extra instances for Quiver"; + license = stdenv.lib.licenses.mit; + }) {}; + "quiver-interleave" = callPackage ({ mkDerivation, base, hspec, QuickCheck, quiver }: mkDerivation { pname = "quiver-interleave"; - version = "0.1.0.0"; - sha256 = "68d5387600de2525002fa4470586c7621372acfea95f3446562c179975334439"; + version = "0.2.0.0"; + sha256 = "756bfdf3b0a932e4452f4f032fc517977e01b19c98b645486ce89f47217ec801"; libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; description = "Interleave values from multiple Quivers"; license = stdenv.lib.licenses.mit; }) {}; + "quiver-sort" = callPackage + ({ mkDerivation, base, binary, directory, exceptions, hspec + , QuickCheck, quiver, quiver-binary, quiver-bytestring + , quiver-groups, quiver-instances, quiver-interleave, resourcet + , temporary, transformers + }: + mkDerivation { + pname = "quiver-sort"; + version = "0.1.0.0"; + sha256 = "ad93f4cdb76043612f816f02e0ca40fdb1396e8b7a96b7e303255eb7b4099d05"; + libraryHaskellDepends = [ + base directory exceptions quiver quiver-binary quiver-bytestring + quiver-groups quiver-instances quiver-interleave resourcet + temporary transformers + ]; + testHaskellDepends = [ + base binary directory exceptions hspec QuickCheck quiver + quiver-instances resourcet temporary transformers + ]; + description = "Sort the values in a quiver"; + license = stdenv.lib.licenses.mit; + }) {}; + "quoridor-hs" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network @@ -173480,7 +174667,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rainbow" = callPackage + "rainbow_0_26_0_6" = callPackage ({ mkDerivation, base, bytestring, lens, process, QuickCheck, text }: mkDerivation { @@ -173494,6 +174681,26 @@ self: { homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rainbow" = callPackage + ({ mkDerivation, base, bytestring, microlens, microlens-th, process + , QuickCheck, text + }: + mkDerivation { + pname = "rainbow"; + version = "0.28.0.0"; + sha256 = "f37da696d9ca7ed36fab25e483c72506d46fdb5446eebf14db8bcc8c2ade8477"; + libraryHaskellDepends = [ + base bytestring microlens microlens-th process text + ]; + testHaskellDepends = [ + base bytestring microlens microlens-th process QuickCheck text + ]; + homepage = "https://www.github.com/massysett/rainbow"; + description = "Print text to terminal with colors and effects"; + license = stdenv.lib.licenses.bsd3; }) {}; "rainbow-tests" = callPackage @@ -173557,18 +174764,18 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, base, bytestring, containers, lens, QuickCheck - , rainbow, tasty, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, containers, microlens-th + , QuickCheck, rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.18.0.6"; - sha256 = "8197c0b75410c760777a7e9e46632de792b5539d2ac1e4fdd9259dbb7cb3ac9b"; + version = "0.18.0.8"; + sha256 = "85b077a51a4846dc94a259faef1bfd13e3f90a40d3a612b6c7e46357e9e9e3bc"; libraryHaskellDepends = [ - base bytestring containers lens rainbow text + base bytestring containers microlens-th rainbow text ]; testHaskellDepends = [ - base bytestring containers lens QuickCheck rainbow tasty + base bytestring containers microlens-th QuickCheck rainbow tasty tasty-quickcheck text ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -174835,26 +176042,27 @@ self: { }) {}; "reactivity" = callPackage - ({ mkDerivation, array, base, bmp, bytestring, comonad - , ConcurrentUtils, containers, Displayable, ghc-prim, list-extras - , monad-loops, monads-tf, parallel, random, time, transformers - , Win32 + ({ mkDerivation, array, base, bmp, bytestring, comctl32, comdlg32 + , comonad, ConcurrentUtils, containers, gdi32, ghc-prim + , list-extras, monad-loops, monads-tf, parallel, random, time + , transformers, Win32, winspool }: mkDerivation { pname = "reactivity"; - version = "0.2.3.0"; - sha256 = "0ba202222b8c196f14576988abe35644d7895db68f128bc8ad042b6bc314f07d"; + version = "0.3.0.0"; + sha256 = "cc86376a74f88b58085252d37622b11917ed9808d07af3aacf86eca8ae31dd12"; libraryHaskellDepends = [ array base bmp bytestring comonad ConcurrentUtils containers - Displayable ghc-prim list-extras monad-loops monads-tf parallel - random time transformers Win32 + ghc-prim list-extras monad-loops monads-tf parallel random time + transformers Win32 ]; - jailbreak = true; - homepage = "http://haskell.org/haskellwiki/reactive"; - description = "(Yet another) alternate implementation of push-pull FRP. This is based on the Reactive package (http://haskell.org/haskellwiki/reactive)."; - license = "unknown"; - broken = true; - }) {Displayable = null;}; + librarySystemDepends = [ comctl32 comdlg32 gdi32 winspool ]; + homepage = "http://www.alkalisoftware.net/Reactivity.html"; + description = "An alternate implementation of push-pull FRP"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {comctl32 = null; comdlg32 = null; gdi32 = null; + winspool = null;}; "reactor" = callPackage ({ mkDerivation, array, base, bits-atomic, comonad, contravariant @@ -174916,6 +176124,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "read-env-var" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "read-env-var"; + version = "0.1.0.0"; + sha256 = "fb70be65ea0889032ac0cef9890370a7c4229602744c1cb67482cfd0dc6b4e5d"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/read-env-var#readme"; + description = "Functions for safely reading environment variables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "readable" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -175017,8 +176238,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "0.5.1"; - sha256 = "e5cab23afd40971c4ff0e5feb0eedd7ff84ba9c73e807a9d7451cea8e64c5a80"; + version = "0.5.2"; + sha256 = "a1181002cd0ac9d1cdad0f43095c4432bea5c19169534b99f6d1321f6a9928ab"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -177428,16 +178649,17 @@ self: { }) {}; "repa-array" = callPackage - ({ mkDerivation, base, bytestring, double-conversion, mtl - , primitive, repa-convert, repa-eval, repa-stream, text, vector + ({ mkDerivation, base, bytestring, double-conversion, filelock, mtl + , primitive, repa-convert, repa-eval, repa-scalar, repa-stream + , text, vector }: mkDerivation { pname = "repa-array"; - version = "4.1.0.1"; - sha256 = "d32a9ad0cce363f6347e83ac0e6ebc2a6be84a03aa1aedbf9b37e7e285147111"; + version = "4.2.2.1"; + sha256 = "167e6317db567d06047c3b926b6335b7c6fd18deac2c9abc29181a33a389acff"; libraryHaskellDepends = [ - base bytestring double-conversion mtl primitive repa-convert - repa-eval repa-stream text vector + base bytestring double-conversion filelock mtl primitive + repa-convert repa-eval repa-scalar repa-stream text vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -177466,8 +178688,8 @@ self: { }: mkDerivation { pname = "repa-convert"; - version = "4.2.1.1"; - sha256 = "dd29b6c83fdfa9d4d7ea63c61c8d43fdbaea606700c4b64cf71f62a5b3e72292"; + version = "4.2.2.1"; + sha256 = "91308bb51fe1ec236b922f3a2f0c3b9a6e3c7c9984d8eb6d41b58baf2a00f741"; libraryHaskellDepends = [ base bytestring double-conversion primitive repa-scalar text vector ]; @@ -177509,10 +178731,9 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "repa-eval"; - version = "4.0.0.1"; - sha256 = "3e41a4fe97ad789e2743961ed797e206f4efe0c326a580cf48aabe329007cf6e"; + version = "4.0.0.2"; + sha256 = "03388b5dbd8fef0374d7edd2a8c182b030ae9ca6ea0a7fb9869b713dba2cf1f7"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Low-level parallel operators on bulk random-accessble arrays"; license = stdenv.lib.licenses.bsd3; @@ -177556,15 +178777,17 @@ self: { "repa-flow" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , primitive, repa-array, repa-eval, repa-stream, text, vector + , hashtables, primitive, repa-array, repa-convert, repa-eval + , repa-scalar, repa-stream, text, vector }: mkDerivation { pname = "repa-flow"; - version = "4.1.0.1"; - sha256 = "e75d36f9c7a4e9a37b3aa26515b569ca4a982aaa0943216bed2b033718277234"; + version = "4.2.2.1"; + sha256 = "db151845cb9f76c391cdffde2ad7d69668f622bd078824660d8fe55aff100e3c"; libraryHaskellDepends = [ - base bytestring containers directory filepath primitive repa-array - repa-eval repa-stream text vector + base bytestring containers directory filepath hashtables primitive + repa-array repa-convert repa-eval repa-scalar repa-stream text + vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -177661,8 +178884,8 @@ self: { }: mkDerivation { pname = "repa-scalar"; - version = "4.2.1.1"; - sha256 = "bdaa0994af4acc9c8e5a4431da10ca44f4bd28b9e81b5e854f2b69f4a437c34a"; + version = "4.2.2.1"; + sha256 = "aea01091cc5e4983470cc7fb53604055e9b592a6eda64c1bab680cdc12b576eb"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -177708,12 +178931,12 @@ self: { }) {}; "repa-stream" = callPackage - ({ mkDerivation, base, mtl, primitive, vector }: + ({ mkDerivation, base, mtl, primitive, repa-scalar, vector }: mkDerivation { pname = "repa-stream"; - version = "4.1.0.1"; - sha256 = "b576da1cb6752c8a56be1e4bad7d991c6ba3fa26500421ad1aaaf4eb7b44c49e"; - libraryHaskellDepends = [ base mtl primitive vector ]; + version = "4.2.2.1"; + sha256 = "a8413a803541fee7108cb404dcbfe3a9463fb2a76f77a1acedbb0d22b06cbe98"; + libraryHaskellDepends = [ base mtl primitive repa-scalar vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Stream functions not present in the vector library"; @@ -180377,8 +181600,8 @@ self: { ({ mkDerivation, base, mtl, primitive, vector }: mkDerivation { pname = "ring-buffer"; - version = "0.1.2"; - sha256 = "8fc8bd6234d0a3a5c427f4c263873f4bfe7ad5496563d318d31ed466524e766b"; + version = "0.1.3"; + sha256 = "3d0c0333711efb14d739e966b37bd6e3f6189125675251f87aa647398d7b2dc7"; libraryHaskellDepends = [ base mtl primitive vector ]; homepage = "http://github.com/bgamari/ring-buffer"; description = "A concurrent, mutable ring-buffer"; @@ -182438,6 +183661,34 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "sarsi" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, Cabal + , containers, cryptonite, directory, filepath, fsnotify, machines + , machines-binary, machines-io, machines-process, msgpack, network + , process, text, unordered-containers, vector + }: + mkDerivation { + pname = "sarsi"; + version = "0.0.1.0"; + sha256 = "fb0fd9a1f67876bc7656c27782ad74f64427e16ab43e3914cdad7d68be56e4b7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers cryptonite directory + filepath machines machines-binary machines-io machines-process + msgpack network process text vector + ]; + executableHaskellDepends = [ + base binary bytestring Cabal containers fsnotify machines + machines-binary machines-io machines-process msgpack network + process text unordered-containers vector + ]; + jailbreak = true; + homepage = "http://github.com/aloiscochard/sarsi"; + description = "A universal quickfix toolkit and his protocol"; + license = stdenv.lib.licenses.asl20; + }) {}; + "sasl" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , monads-tf, papillon, simple-pipe @@ -183821,6 +185072,7 @@ self: { homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-rest" = callPackage @@ -185201,6 +186453,7 @@ self: { fsnotify hspec hspec-wai http-client http-types interpolate mockery network process silently stm text time unix wai warp ]; + jailbreak = true; homepage = "https://github.com/hspec/sensei#readme"; description = "Automatically run Hspec tests on file modifications"; license = stdenv.lib.licenses.mit; @@ -185829,7 +187082,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_6" = callPackage + "servant_0_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-api-data, http-media, http-types @@ -185838,8 +187091,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.6"; - sha256 = "6b5d37abfaaab871bc6fe5164d7b55839713883f162b2c551eb078b4dbaa63a4"; + version = "0.6.1"; + sha256 = "830154335052270314be49644db3a88665b1910d1678ff35337a9b3caabaab3a"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring bytestring-conversion case-insensitive http-api-data http-media http-types network-uri @@ -185968,12 +187221,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-blaze_0_6" = callPackage + "servant-blaze_0_6_1" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.6"; - sha256 = "b69560b0169f175e53d73b9cdeb48e8e747ece65d787f9e1a36dbd83a8dd344f"; + version = "0.6.1"; + sha256 = "f34b45f7c15f53858034052bc0e662ce884ca2c231bc7f3fecc69bc8763f209f"; libraryHaskellDepends = [ base blaze-html http-media servant ]; jailbreak = true; homepage = "http://haskell-servant.github.io/"; @@ -185986,8 +187239,8 @@ self: { ({ mkDerivation, base, cassava, http-media, servant, vector }: mkDerivation { pname = "servant-cassava"; - version = "0.6"; - sha256 = "ca050cda16220cc8483d0a41e952d6858cad01670b3e6576620a30a824c886d9"; + version = "0.6.1"; + sha256 = "2cd80c3c5e92111e4ccca8a0aeef5001cb5e64ca31365fa363148a2d239e781f"; libraryHaskellDepends = [ base cassava http-media servant vector ]; jailbreak = true; homepage = "http://haskell-servant.github.io/"; @@ -186182,7 +187435,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_6" = callPackage + "servant-client_0_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, deepseq, exceptions, hspec, http-api-data , http-client, http-client-tls, http-media, http-types, HUnit @@ -186192,8 +187445,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.6"; - sha256 = "f55942b5b7f70bdfda88ccc8d3680d86098217cbb0d8befd6946be9597d7c0cd"; + version = "0.6.1"; + sha256 = "3b2724cd01fd60c10132b4c20384e5bc734f2e46b03db9b6a0f6d4b947decee4"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring exceptions http-api-data http-client http-client-tls http-media http-types @@ -186408,7 +187661,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_6" = callPackage + "servant-docs_0_6_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-conversion, case-insensitive, control-monad-omega , hashable, hspec, http-media, http-types, lens, servant @@ -186416,8 +187669,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.6"; - sha256 = "9cdcc0f09a8f0c7a36b35df816dbdf2b856ff6b7105e3bc53d655be46da32bde"; + version = "0.6.1"; + sha256 = "66604bcbeee4f84847d64fb7ed127eb4f32570d16a33aa24adf2684688aae33b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186514,8 +187767,8 @@ self: { ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.6"; - sha256 = "418a2d4ae181af1f41c0a6fbf04c089f4e37d5b5775996dc25d0a8920b5c4d3a"; + version = "0.6.1"; + sha256 = "de131f3538d9e01a5c9a8c57ee85a22753fa25e80f98031e0c2947c5aca9b324"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; jailbreak = true; @@ -186741,8 +187994,8 @@ self: { }: mkDerivation { pname = "servant-js"; - version = "0.6"; - sha256 = "8da1c25454b65f0900878677e134dafbc5a55201bdf0c2f9728eff766a75835e"; + version = "0.6.1"; + sha256 = "8bafcd5632bb49346280a1922e1708e55da639c485347d0566724445e2854611"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186767,8 +188020,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.6"; - sha256 = "5488cc1577b1fbc431432b5b1c16a513bfc7e80a849ad0edd2789823895d4883"; + version = "0.6.1"; + sha256 = "bb0d27b58f21e4921f302a0902ead2377372617df80ab829be9dd296d1f031e6"; libraryHaskellDepends = [ base http-media lucid servant ]; jailbreak = true; homepage = "http://haskell-servant.github.io/"; @@ -186798,15 +188051,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-mock_0_6" = callPackage + "servant-mock_0_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server , transformers, wai, warp }: mkDerivation { pname = "servant-mock"; - version = "0.6"; - sha256 = "98082a96e654e9050f54d998d9af68b3ae61f20ad9224a9c5ba95e60ec964227"; + version = "0.6.1"; + sha256 = "c612d546f82f0b633cab8396c71583f0866034abd9c3f2462fce3faec9006621"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187194,7 +188447,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_6" = callPackage + "servant-server_0_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, bytestring-conversion, containers , directory, doctest, exceptions, filemanip, filepath, hspec @@ -187206,8 +188459,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.6"; - sha256 = "1cdeb903f8d21b45a45c0008c04e18bcbebfb8e0706a20045daf300f65cf911d"; + version = "0.6.1"; + sha256 = "4d1b0871008945009bf4d4756108cc1376edbd08e49ce96d9c1365d9b382ec07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187218,11 +188471,11 @@ self: { ]; executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ - aeson base base-compat bytestring bytestring-conversion directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck safe servant should-not-typecheck - string-conversions temporary text transformers transformers-compat - wai wai-extra warp + aeson base base-compat base64-bytestring bytestring + bytestring-conversion directory doctest exceptions filemanip + filepath hspec hspec-wai http-types mtl network parsec QuickCheck + safe servant should-not-typecheck string-conversions temporary text + transformers transformers-compat wai wai-extra warp ]; jailbreak = true; homepage = "http://haskell-servant.github.io/"; @@ -188476,7 +189729,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shake-language-c" = callPackage + "shake-language-c_0_8_4" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers }: @@ -188493,6 +189746,46 @@ self: { homepage = "https://github.com/samplecount/shake-language-c"; description = "Utilities for cross-compiling with Shake"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shake-language-c_0_8_6" = callPackage + ({ mkDerivation, base, data-default-class, directory, doctest + , fclabels, hspec, process, shake, split, unordered-containers + }: + mkDerivation { + pname = "shake-language-c"; + version = "0.8.6"; + sha256 = "edd2b2dc4178f78335c78cd290d4958e79aa99dbd85cc8f1c66e37b5f9bdc204"; + libraryHaskellDepends = [ + base data-default-class fclabels process shake split + unordered-containers + ]; + testHaskellDepends = [ base directory doctest hspec shake ]; + doCheck = false; + homepage = "https://github.com/samplecount/shake-language-c"; + description = "Utilities for cross-compiling with Shake"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shake-language-c" = callPackage + ({ mkDerivation, base, data-default-class, directory, doctest + , fclabels, hspec, process, shake, split, unordered-containers + }: + mkDerivation { + pname = "shake-language-c"; + version = "0.9.1"; + sha256 = "827d4225d9c52ab784793831a41f5f594ece21113ad0e5da540505a42842db70"; + libraryHaskellDepends = [ + base data-default-class fclabels process shake split + unordered-containers + ]; + testHaskellDepends = [ base directory doctest hspec shake ]; + doCheck = false; + homepage = "https://github.com/samplecount/shake-language-c"; + description = "Utilities for cross-compiling with Shake"; + license = stdenv.lib.licenses.asl20; }) {}; "shake-minify" = callPackage @@ -191963,8 +193256,8 @@ self: { }: mkDerivation { pname = "smtps-gmail"; - version = "1.3.1"; - sha256 = "d70bbd06bd3dec44a96dbaff9a8ddb1af6e67703775df7c297e771e4cdadd39b"; + version = "1.3.2"; + sha256 = "0f6cf84bb2bbe6066e95b3084b2d6a381751d9140c0d5c58e00aa1e6491e881c"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring conduit conduit-extra data-default filepath mime-mail network resourcet stringsearch text @@ -193387,15 +194680,15 @@ self: { "snaplet-purescript" = callPackage ({ mkDerivation, base, configurator, mtl, raw-strings-qq, shelly - , snap, snap-core, text, transformers + , snap, snap-core, string-conv, text, transformers }: mkDerivation { pname = "snaplet-purescript"; - version = "0.4.0.0"; - sha256 = "508f797ca18b48c95c1ab371956070df83e1c4365d1cf698e39631e888b224f8"; + version = "0.4.1.0"; + sha256 = "0b5edf0aa99abe36eab3d127c02d0352338cbc5f53437c374dce5f116b4180a2"; libraryHaskellDepends = [ - base configurator mtl raw-strings-qq shelly snap snap-core text - transformers + base configurator mtl raw-strings-qq shelly snap snap-core + string-conv text transformers ]; description = "Automatic (re)compilation of purescript projects"; license = stdenv.lib.licenses.mit; @@ -194041,12 +195334,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "socket_0_5_3_1" = callPackage + ({ mkDerivation, async, base, bytestring }: + mkDerivation { + pname = "socket"; + version = "0.5.3.1"; + sha256 = "d32a2ac77d54ce74507cc24d0bf68a719ea67ee961c61d367bfb9f0010e9c044"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring ]; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "A portable and extensible sockets library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "socket" = callPackage ({ mkDerivation, async, base, bytestring }: mkDerivation { pname = "socket"; - version = "0.6.0.0"; - sha256 = "c7b7458ab32259444f4426e2b52057ab925b098090c8458e19b091a027e235e6"; + version = "0.6.0.1"; + sha256 = "d6b2a2bbb331997314a4b94a21530ea36d00888cbc86ab59c9a33e8ed1f03d20"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring ]; homepage = "https://github.com/lpeterse/haskell-socket"; @@ -196660,10 +197967,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.0.4.2"; - sha256 = "3becd40f8886477a943e2feaed6b34d0ea283e770dc35379944e41cb770838d2"; - revision = "2"; - editedCabalFile = "27ed2fa5c035d631eda2be1b73da98e6b627da5277cfd9a4b1a31941ad9484b1"; + version = "1.0.4.3"; + sha256 = "2a445ff671cfd75ccf3185c52832298598dc03dbfbede2b7be21237f63c305b2"; + revision = "1"; + editedCabalFile = "d637dfe390596b7ee702c516d177ffd266ab110c4a0b691c9a7d49d274382e08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197191,7 +198498,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-curator" = callPackage + "stackage-curator_0_13_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, binary, binary-tagged, blaze-html , byteable, bytestring, Cabal, classy-prelude-conduit, conduit @@ -197235,6 +198542,53 @@ self: { homepage = "https://github.com/fpco/stackage"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stackage-curator" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async + , base, base16-bytestring, binary, binary-tagged, blaze-html + , byteable, bytestring, Cabal, classy-prelude-conduit, conduit + , conduit-extra, containers, cryptohash, cryptohash-conduit + , data-default-class, directory, filepath, hspec, html-conduit + , http-client, http-client-tls, http-conduit, lucid, mime-types + , monad-unlift, mono-traversable, mtl, old-locale + , optparse-applicative, optparse-simple, process, QuickCheck + , resourcet, semigroups, stackage-cli, stackage-install + , stackage-metadata, stackage-types, stm, streaming-commons, syb + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, utf8-string, xml-conduit, xml-types + , yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.13.2"; + sha256 = "09373b993ef5958e945c38cff08c6dabdbd3f71e61f8ffc049ba30196c3bae6b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 async base + base16-bytestring binary binary-tagged blaze-html byteable + bytestring Cabal classy-prelude-conduit conduit conduit-extra + containers cryptohash cryptohash-conduit data-default-class + directory filepath html-conduit http-client http-client-tls + http-conduit lucid mime-types monad-unlift mono-traversable mtl + old-locale process resourcet semigroups stackage-install + stackage-metadata stackage-types stm streaming-commons syb + system-fileio system-filepath tar temporary text time transformers + unix-compat utf8-string xml-conduit xml-types yaml zlib + ]; + executableHaskellDepends = [ + base http-client http-client-tls optparse-applicative + optparse-simple stackage-cli system-filepath text + ]; + testHaskellDepends = [ + base Cabal classy-prelude-conduit containers directory hspec + http-client http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; }) {}; "stackage-install_0_1_0_3" = callPackage @@ -198130,8 +199484,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "stemmer"; - version = "0.5.1"; - sha256 = "a092ccc06783c97f38aa703914e057cae02f1c69a6c10dacfb7c59ec39e43c4a"; + version = "0.5.2"; + sha256 = "757449eda1d1a8c64139a8e4ea12e616382961e0b7ed8f2dbaf1a970d35ce6dd"; libraryHaskellDepends = [ base ]; homepage = "http://www.github.com/bgamari/stemmer"; description = "Haskell bindings to the Snowball stemming library"; @@ -199090,7 +200444,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming" = callPackage + "streaming_0_1_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mmorph , mtl, resourcet, time, transformers, transformers-base }: @@ -199105,6 +200459,24 @@ self: { homepage = "https://github.com/michaelt/streaming"; description = "an elementary streaming prelude and general stream type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, mmorph, mtl, resourcet + , time, transformers, transformers-base + }: + mkDerivation { + pname = "streaming"; + version = "0.1.4.1"; + sha256 = "d2e2dde11a3a4700948af4f0695cd8c71ec0b328b410d88d6779fabfd956cc54"; + libraryHaskellDepends = [ + base exceptions ghc-prim mmorph mtl resourcet time transformers + transformers-base + ]; + homepage = "https://github.com/michaelt/streaming"; + description = "an elementary streaming prelude and general stream type"; + license = stdenv.lib.licenses.bsd3; }) {}; "streaming-bytestring_0_1_4_0" = callPackage @@ -199125,7 +200497,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-bytestring" = callPackage + "streaming-bytestring_0_1_4_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, streaming, transformers, transformers-base }: @@ -199140,6 +200512,24 @@ self: { homepage = "https://github.com/michaelt/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-bytestring" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, streaming, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.4.3"; + sha256 = "d0a4e74d59fa2266a6b5aa7500951eaf0267cc9fa92d845589dc28ebb78903b9"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + homepage = "https://github.com/michaelt/streaming-bytestring"; + description = "effectful byte steams, or: bytestring io done right"; + license = stdenv.lib.licenses.bsd3; }) {}; "streaming-commons_0_1_7_3" = callPackage @@ -201325,8 +202715,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, containers }: mkDerivation { pname = "svm-light-utils"; - version = "0.1.3"; - sha256 = "fa5770c144c516485e409cc164cbc1e4f7dc5f1a32f41dd95356964c663e2e23"; + version = "0.1.4"; + sha256 = "e784b3623e34d7a919d9c7d48c85e3c3fb6143a054873628efc096dd682a9f07"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; homepage = "http://github.com/bgamari/svm-light-utils"; description = "Parsers and formatters for the SVMlight input file format"; @@ -201742,14 +203132,12 @@ self: { }) {}; "sym" = callPackage - ({ mkDerivation, array, base, containers, hashable, QuickCheck - , vector - }: + ({ mkDerivation, base, containers, hashable, QuickCheck, vector }: mkDerivation { pname = "sym"; - version = "0.12.0"; - sha256 = "ebf057577a494ad1da24f2076f2ec553b0ad58dd60449922e4dbb2c82a4b0ad8"; - libraryHaskellDepends = [ array base containers hashable vector ]; + version = "0.12.1"; + sha256 = "3cdfd1a1234b02195bb60d4b8fde98ec0aca1c923e17c65cf60b0150f6100062"; + libraryHaskellDepends = [ base containers hashable vector ]; testHaskellDepends = [ base hashable QuickCheck ]; homepage = "https://github.com/akc/sym"; description = "Permutations, patterns, and statistics"; @@ -201889,7 +203277,7 @@ self: { homepage = "https://github.com/jetho/syncthing-hs"; description = "Haskell bindings for the Syncthing REST API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synt" = callPackage @@ -204867,7 +206255,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tellbot" = callPackage + "tellbot_0_6_0_11" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text , time, transformers @@ -204885,6 +206273,27 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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.12"; + sha256 = "a4e05148a628e813d677c960eb22616f13306ff1e1025eb503b1a4b94f6bc218"; + 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; }) {}; "template" = callPackage @@ -205010,6 +206419,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tempo" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, ConfigFile + , directory, filepath, http-conduit, MissingH, mtl, process + , regex-posix, resourcet, split, time + }: + mkDerivation { + pname = "tempo"; + version = "0.1.0.0"; + sha256 = "38cf611fda7a074375b8cf4c25ed95ac3fb88e51a4d823f3f419d3b90999963d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring ConfigFile directory filepath + http-conduit mtl process regex-posix resourcet split time + ]; + executableHaskellDepends = [ base MissingH mtl time ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/candidtim/tempo#readme"; + description = "Command-line tool to log time-tracking information into JIRA Tempo plugin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tempodb" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , HsOpenSSL, HTTP, http-streams, io-streams, mtl, old-locale, text @@ -208530,12 +209961,13 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.1"; - sha256 = "0c84459f67334b94ba0b95c142ca37cae7969436344661b01482e753b2eba511"; + version = "0.6"; + sha256 = "ff5595e51cf5d93f12ab89465fccfd0cb7905d58ebb93c0d706fd782075e4597"; libraryHaskellDepends = [ base bytestring containers hashable hosc PortMidi process tidal time ]; + jailbreak = true; homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; @@ -209056,8 +210488,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "timelike"; - version = "0.2.1"; - sha256 = "31eed7705c7cab996edcf5471fac216127c2289cb6e1948ff841a9a6886d0043"; + version = "0.2.2"; + sha256 = "ad40043b33e01aa73b1914bda7a912649dfa449171779f55761cdc4be053b73f"; libraryHaskellDepends = [ base transformers ]; homepage = "http://hub.darcs.net/esz/timelike"; description = "Type classes for types representing time"; @@ -209796,7 +211228,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls" = callPackage + "tls_1_3_4" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, hourglass, memory, mtl , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 @@ -209820,6 +211252,31 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tls" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, hourglass, memory, mtl + , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 + , x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.3.5"; + sha256 = "ff2c21a8a9d1f34ccc5dcf816c2a873a91ab15ab4c7876cd7b88c3052624a08f"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default-class hourglass mtl + QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; }) {}; "tls-debug_0_3_4" = callPackage @@ -209864,7 +211321,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls-debug" = callPackage + "tls-debug_0_4_1" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system , x509-validation @@ -209882,6 +211339,27 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tls-debug" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, time, tls, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.2"; + sha256 = "8d39924ebaa304342935a4fb31b6c7fb2437142f520e0c95af9ad397efc32b01"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem time tls + x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; }) {}; "tls-extra" = callPackage @@ -210518,7 +211996,10 @@ self: { pname = "transactional-events"; version = "0.1.0.0"; sha256 = "b47e21951c88ec3243c6f977b2d59e2688c536e3f182e3d7e80700bb88636349"; + revision = "1"; + editedCabalFile = "9ae1e516b5cb6219828469b330ff7017a5b943d2791f64f8bffc34ea7f964d83"; libraryHaskellDepends = [ base ListZipper MonadPrompt stm ]; + jailbreak = true; description = "Transactional events, based on Concurrent ML semantics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -210775,26 +212256,51 @@ self: { }) {}; "transient" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , HTTP, mtl, network, network-info, process, random, SHA, stm - , TCache, time, transformers + ({ mkDerivation, base, containers, directory, filepath, HTTP, mtl + , network, process, random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.1.1"; - sha256 = "edd779a4ef2c7762ddd097427a16dc96eddc6d1d0fbf714f85b7304c290819ed"; - revision = "2"; - editedCabalFile = "ed7129095502ad5fc1ca8aa9dbfe7526110681f7d1ffb6ff8249b359d52d3b40"; + version = "0.3"; + sha256 = "3bbbef6058242d8b09a759171f0ca98e24a373f833f463bd2a8ed3abc06df280"; libraryHaskellDepends = [ - base bytestring containers directory filepath HTTP mtl network - network-info process random SHA stm TCache time transformers + base containers mtl stm time transformers + ]; + testHaskellDepends = [ + base containers directory filepath HTTP mtl network process random + stm transformers ]; homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Making composable programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transient-universe" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, mtl, network, network-info + , network-uri, process, random, stm, TCache, text, time + , transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.2"; + sha256 = "266b3dacc641a80fbba748557522e1904b363760cba4857ce1627912ff7865c7"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache time transformers vector websockets + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "remote execution and map-reduce: distributed computing for transient"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -212236,8 +213742,8 @@ self: { }: mkDerivation { pname = "twilio"; - version = "0.1.3.0"; - sha256 = "e3a25a6896c83d84c347510e7112b597d398e4e04b5254c5732e2b2b4354b4e1"; + version = "0.1.3.1"; + sha256 = "93bba9aa0d6073ec217c55e7331ff8dd8243b508b56ebc170ede0510a9034b6f"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers errors exceptions free http-client http-client-tls http-types mtl network-uri old-locale @@ -212441,7 +213947,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-conduit" = callPackage + "twitter-conduit_0_1_3" = callPackage ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base , bytestring, case-insensitive, conduit, conduit-extra, containers , data-default, doctest, hlint, hspec, http-client, http-conduit @@ -212473,6 +213979,38 @@ 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-conduit" = callPackage + ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base + , bytestring, case-insensitive, conduit, conduit-extra, containers + , data-default, doctest, exceptions, hlint, hspec, http-client + , http-conduit, http-types, lens, lens-aeson, network-uri + , resourcet, template-haskell, text, time, transformers + , transformers-base, twitter-types, twitter-types-lens + }: + mkDerivation { + pname = "twitter-conduit"; + version = "0.2.0"; + sha256 = "145c39a7abfeb66c68a7f20a7ba829586fa4b664edef637a54ac7f41a5f3a04c"; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base bytestring conduit + conduit-extra containers data-default exceptions http-client + http-conduit http-types lens lens-aeson resourcet template-haskell + text time transformers transformers-base twitter-types + twitter-types-lens + ]; + testHaskellDepends = [ + aeson attoparsec authenticate-oauth base bytestring + case-insensitive conduit conduit-extra containers data-default + doctest hlint hspec http-client http-conduit http-types lens + lens-aeson network-uri resourcet template-haskell text time + twitter-types twitter-types-lens + ]; + homepage = "https://github.com/himura/twitter-conduit"; + description = "Twitter API package with conduit interface and Streaming API support"; + license = stdenv.lib.licenses.bsd3; }) {}; "twitter-enumerator" = callPackage @@ -214187,6 +215725,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unfoldable-restricted" = callPackage + ({ mkDerivation, base, constraints, containers, hashable + , transformers, unfoldable, unit-constraint, unordered-containers + }: + mkDerivation { + pname = "unfoldable-restricted"; + version = "0.0.2"; + sha256 = "c6954fbfc46b00d3f98ed2e02a4009fe018ae6032c404fec3022cdc0ae622f2b"; + libraryHaskellDepends = [ + base constraints containers hashable transformers unfoldable + unit-constraint unordered-containers + ]; + description = "An alternative to the Unfoldable typeclass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ungadtagger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -214609,6 +216163,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unit-constraint" = callPackage + ({ mkDerivation, base, constraints }: + mkDerivation { + pname = "unit-constraint"; + version = "0.0.0"; + sha256 = "446de8480016c9db75676445477b5ce1ff5c6d486d6708c55b06de7cbd845e59"; + libraryHaskellDepends = [ base constraints ]; + description = "Extremely simple typeclass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "units" = callPackage ({ mkDerivation, base, containers, HUnit-approx, mtl, multimap , singletons, syb, tasty, tasty-hunit, template-haskell, th-desugar @@ -216476,7 +218041,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "uu-parsinglib" = callPackage + "uu-parsinglib_2_9_1" = callPackage ({ mkDerivation, base, ListLike, time, uu-interleaved }: mkDerivation { pname = "uu-parsinglib"; @@ -216486,6 +218051,19 @@ self: { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "uu-parsinglib" = callPackage + ({ mkDerivation, base, ListLike, time, uu-interleaved }: + mkDerivation { + pname = "uu-parsinglib"; + version = "2.9.1.1"; + sha256 = "d25f5ae36641136143c72b1d29f24d093cb07327d14a7518af90801e5d67bb6c"; + libraryHaskellDepends = [ base ListLike time uu-interleaved ]; + homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; + description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators"; + license = stdenv.lib.licenses.mit; }) {}; "uu-tc" = callPackage @@ -217922,7 +219500,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-fftw" = callPackage + "vector-fftw_0_1_3_5" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; @@ -217933,6 +219511,20 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fftw;}; + + "vector-fftw" = callPackage + ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: + mkDerivation { + pname = "vector-fftw"; + version = "0.1.3.6"; + sha256 = "6ed9d7b6000fdc72d76e7d5a3bfe1441f67eee46bf6f814caf3c35524b000764"; + libraryHaskellDepends = [ base primitive storable-complex vector ]; + librarySystemDepends = [ fftw ]; + homepage = "http://hackage.haskell.org/package/vector-fftw"; + description = "A binding to the fftw library for one-dimensional vectors"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -218784,14 +220376,13 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.2.0.4"; - sha256 = "8ce9dbb192bfae4fb7e8e5b470a27d9197aef1c46baa83843a0ac8ac280ab21e"; - revision = "5"; - editedCabalFile = "588b1a39865383e72566ed5c9ef5be6b06bf90c8260b0c7717f178c37b72e30a"; + version = "0.2.0.5"; + sha256 = "fd56271270f68f4c60f4e7ac03a5a540288fb0b80739b094e2a8f5e737dab373"; libraryHaskellDepends = [ base binary bytestring containers filepath hashable MonadRandom mtl network process random random-shuffle split stm time transformers ]; + homepage = "http://vivid-synth.com"; description = "Sound synthesis with SuperCollider"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -219356,7 +220947,6 @@ self: { base bytestring conduit conduit-extra directory doctest filepath hspec HTTP http-types unix wai warp ]; - jailbreak = true; homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "File/CGI/Rev Proxy App of WAI"; license = stdenv.lib.licenses.bsd3; @@ -220601,6 +222191,8 @@ self: { pname = "wai-extra"; version = "3.0.15"; sha256 = "6629e2f2db30e3b7f70ef96b06f4a0df32c7b9093eec30d9ad79919826ec4270"; + revision = "1"; + editedCabalFile = "c6ee5d56d32c09d79a88fb7590e70a4042e6128cccae14817d10e05e037d13df"; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -222492,19 +224084,26 @@ self: { }) {}; "warc" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, either, errors, free - , lens, pipes, pipes-attoparsec, pipes-bytestring, text, time + ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions + , filepath, free, lens, mmorph, optparse-applicative, pipes + , pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time , transformers }: mkDerivation { pname = "warc"; - version = "0.1.1.1"; - sha256 = "9530f595264316d474abb194754d69c4857b8ccc65e49280e430fd596eb65260"; + version = "0.2.0"; + sha256 = "dc53a6f3442b659cf79a9bfd56195b83fe3dcdbc731b4a15ad5e9ee2ea02c03c"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring either errors free lens pipes + attoparsec base bytestring errors free lens mmorph pipes pipes-attoparsec pipes-bytestring text time transformers ]; - jailbreak = true; + executableHaskellDepends = [ + attoparsec base bytestring errors exceptions filepath free lens + optparse-applicative pipes pipes-attoparsec pipes-bytestring + pipes-zlib text time transformers + ]; homepage = "http://github.com/bgamari/warc"; description = "A parser for the Web Archive (WARC) format"; license = stdenv.lib.licenses.bsd3; @@ -223249,38 +224848,6 @@ self: { , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, simple-sendfile, stm, streaming-commons, text, time - , transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.3"; - sha256 = "3a218d436cd77d41a157e67721ac59892e70f09fcd39594fc4707dabec760ee8"; - libraryHaskellDepends = [ - array auto-update base blaze-builder bytestring bytestring-builder - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - doCheck = false; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_6" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process , QuickCheck, silently, simple-sendfile, stm, streaming-commons , text, time, transformers, unix, unix-compat, vault, wai, word8 }: @@ -223302,11 +224869,10 @@ self: { simple-sendfile stm streaming-commons text time transformers unix unix-compat vault wai word8 ]; - jailbreak = true; + doCheck = false; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -224161,10 +225727,8 @@ self: { }: mkDerivation { pname = "webapi"; - version = "0.2.0.0"; - sha256 = "473b1051b0833d90d5485f467cfaa69bc7777a24973cf0628ec0d006da60500b"; - revision = "1"; - editedCabalFile = "e374eaff480d32831ea7ec5cddfdaed5c58ed38a1517635a8ec5fbb321956535"; + version = "0.2.1.0"; + sha256 = "3c3a93a48f25e809601b9f20f16327f7fb730747e441824e53b3b0d83f260233"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing bytestring-trie case-insensitive containers cookie exceptions @@ -224564,6 +226128,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webdriver-angular_0_1_10" = callPackage + ({ mkDerivation, aeson, base, hspec, hspec-webdriver + , language-javascript, template-haskell, text, transformers + , unordered-containers, wai-app-static, warp, webdriver + }: + mkDerivation { + pname = "webdriver-angular"; + version = "0.1.10"; + sha256 = "93e341b71b93ecd09a9bdfeae6b5debb4b92832e647ed041f435a6ef0bc34c5b"; + libraryHaskellDepends = [ + aeson base language-javascript template-haskell text transformers + unordered-containers webdriver + ]; + testHaskellDepends = [ + base hspec hspec-webdriver transformers wai-app-static warp + webdriver + ]; + jailbreak = true; + homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; + description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webdriver-snoy" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree @@ -224723,6 +226311,20 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; + "webkitgtk3-javascriptcore_0_14_0_0" = callPackage + ({ mkDerivation, base, gtk2hs-buildtools, webkit }: + mkDerivation { + pname = "webkitgtk3-javascriptcore"; + version = "0.14.0.0"; + sha256 = "1e77bcdb17dad3c1db88c5c1a498c9b804a1c486a7397d22fd1f16d874b27477"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ webkit ]; + 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 ({ mkDerivation, base, blaze-html, data-default, hastache, lucid , text @@ -225159,28 +226761,28 @@ self: { ({ mkDerivation, aeson, base, containers, directory, extra , filepath, lens, MonadRandom, mtl, optparse-applicative , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text - , transformers + , tostring, transformers }: mkDerivation { pname = "werewolf"; - version = "0.5.2.0"; - sha256 = "2bf5465e38c31694c24c1d985e514c89b6c503638ecccc9a45b74dae6aac0e57"; + version = "1.0.0.0"; + sha256 = "1f5febe542ef8bbb5e2c8a0d29785ca6056a33224f8240791e7511e90b04d411"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers directory extra filepath lens mtl text - transformers + aeson base containers directory extra filepath lens MonadRandom mtl + text tostring transformers ]; executableHaskellDepends = [ aeson base directory extra filepath lens MonadRandom mtl optparse-applicative random-shuffle text transformers ]; testHaskellDepends = [ - base containers extra lens mtl QuickCheck tasty tasty-quickcheck - text + base containers extra lens MonadRandom mtl QuickCheck tasty + tasty-quickcheck text ]; homepage = "https://github.com/hjwylde/werewolf"; - description = "A game engine for playing werewolf within a chat client"; + description = "A game engine for playing werewolf within an arbitrary chat client"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -225191,8 +226793,10 @@ self: { }: mkDerivation { pname = "werewolf-slack"; - version = "0.3.0.2"; - sha256 = "d086961fcb554c11174d8a40233ddc43ba5d4de92ead79bf238831e3f7f0e9da"; + version = "1.0.0.0"; + sha256 = "882eaeba0d24555265601da806ca89a9e5ee313a850f59dcbc8de6418f80a407"; + revision = "2"; + editedCabalFile = "c45c8d29405ce51049a2a72dbca21ae974d7c05c1fa966d469b06bc532b9dbfa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225200,7 +226804,7 @@ self: { mtl optparse-applicative process text wai warp werewolf ]; homepage = "https://github.com/hjwylde/werewolf-slack"; - description = "A Slack chat client for playing werewolf"; + description = "A chat interface for playing werewolf in Slack"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -225607,13 +227211,17 @@ self: { }) {}; "wkt" = callPackage - ({ mkDerivation, base, lens, linear, parsec, parsec-numbers }: + ({ mkDerivation, base, filepath, lens, linear, tasty, tasty-golden + , trifecta + }: mkDerivation { pname = "wkt"; - version = "0.2.6"; - sha256 = "ef27992128212510566866e2d008bfc55999a2e87eb9fa6f25aba00c4039a49d"; - libraryHaskellDepends = [ base lens linear parsec parsec-numbers ]; - jailbreak = true; + version = "0.3.0"; + sha256 = "2154fdd2bfe62ebef45319896e2eedb7a3d386d144b686bd7f3b5169621c0e4f"; + libraryHaskellDepends = [ base lens linear trifecta ]; + testHaskellDepends = [ + base filepath lens linear tasty tasty-golden trifecta + ]; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -227268,8 +228876,8 @@ self: { }: mkDerivation { pname = "xdcc"; - version = "1.0.1"; - sha256 = "f0694a7de64886883dade774e23121a9b2f247cd9efa6d61d7fe0b08fe56ff9d"; + version = "1.0.2"; + sha256 = "c2df40bc60e3fb0156d8a7790815cf3d9c96dd5c945ad36ea879eab0c4748935"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228191,7 +229799,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit" = callPackage + "xml-conduit_1_3_4" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -228213,6 +229821,31 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xml-conduit" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default, deepseq, hspec, HUnit, monad-control, resourcet + , text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.3.4.1"; + sha256 = "0558ec1808167fb43aeaf02a56aaa2e2b27385f21927889529db5ef9eb18f7fd"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default deepseq monad-control + resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; }) {}; "xml-conduit-parse" = callPackage @@ -229907,7 +231540,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage + "yaml_0_8_16" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -229934,6 +231567,39 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + + "yaml" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, raw-strings-qq + , resourcet, scientific, semigroups, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.17"; + sha256 = "65d8585e80c334318d0c6b1fbefaf07f8e99163b8eff2166decea7b21185d397"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific semigroups text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ + aeson base bytestring raw-strings-qq text + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit hspec HUnit + mockery resourcet text transformers unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -230539,7 +232205,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod" = callPackage + "yesod_1_4_2_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit-extra, data-default, directory, fast-logger , monad-control, monad-logger, safe, semigroups, shakespeare @@ -230561,6 +232227,31 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit-extra, data-default, directory, fast-logger + , monad-control, monad-logger, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, transformers, unix + , unordered-containers, wai, wai-extra, wai-logger, warp, yaml + , yesod-auth, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.4.3"; + sha256 = "13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit-extra + data-default directory fast-logger monad-control monad-logger safe + semigroups shakespeare streaming-commons template-haskell text + transformers unix unordered-containers wai wai-extra wai-logger + warp yaml yesod-auth yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-angular" = callPackage @@ -231087,7 +232778,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth" = callPackage + "yesod-auth_1_4_13" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -231114,6 +232805,36 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.13.1"; + sha256 = "cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-auth-account" = callPackage @@ -233770,7 +235491,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_20" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -233807,6 +235528,46 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-core" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, directory, exceptions, fast-logger, hspec + , hspec-expectations, http-types, HUnit, lifted-base, monad-control + , monad-logger, mtl, mwc-random, network, old-locale, parsec + , path-pieces, primitive, QuickCheck, random, resourcet, safe + , semigroups, shakespeare, streaming-commons, template-haskell + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.20.1"; + sha256 = "e742d6cb5b7f65b97f9dbb7e9586ef4cc27169aa7ac7a030119e6c52b69c4f86"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq directory + exceptions fast-logger http-types lifted-base monad-control + monad-logger mtl mwc-random old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers transformers-base unix-compat + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -234489,6 +236250,7 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-markdown" = callPackage @@ -234832,6 +236594,7 @@ self: { homepage = "https://github.com/cutsea110/yesod-pnotify"; description = "Yet another getMessage/setMessage using pnotify jquery plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-pure" = callPackage @@ -235355,6 +237118,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-static-angular_0_1_8" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, blaze-markup + , bytestring, data-default, directory, filepath, hamlet, hspec + , HUnit, language-javascript, mime-types, shakespeare + , template-haskell, text, yesod, yesod-core, yesod-static + , yesod-test + }: + mkDerivation { + pname = "yesod-static-angular"; + version = "0.1.8"; + sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-builder blaze-markup bytestring data-default + directory filepath hamlet language-javascript mime-types + shakespeare template-haskell text yesod-core yesod-static + ]; + executableHaskellDepends = [ + base data-default shakespeare yesod yesod-static + ]; + testHaskellDepends = [ + base bytestring hamlet hspec HUnit shakespeare template-haskell + text yesod-core yesod-static yesod-test + ]; + jailbreak = true; + homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; + description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-table_1_0_3" = callPackage ({ mkDerivation, base, containers, contravariant, text, yesod-core }: @@ -236946,10 +238741,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.1"; - sha256 = "642a84ab891b4dee722d0c60d46703b6812298fcf56fe11ce803dbeaa3d156dd"; - revision = "1"; - editedCabalFile = "96d5a60a37b746603f6744020811ab38a35ae6be28b75a3fbe8f998c55d7dfd6"; + version = "0.1.2"; + sha256 = "a89517ad4b2d2addc7d4c75f3bf51c37770d9ffafc291573d51774b0c36d11fc"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 740047e2c27f5..66e151aefe3c0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -41,7 +41,7 @@ let hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html - llvm = lib.makeSearchPath "bin" + llvm = lib.makeBinPath ([ llvmPackages.llvm ] ++ lib.optional stdenv.isDarwin llvmPackages.clang); in diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix new file mode 100644 index 0000000000000..c9097bec5dc8e --- /dev/null +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, unzip}: +let + s = # Generated upstream information + rec { + baseName="angelscript"; + version = "2.22.2"; + name="${baseName}-${version}"; + url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; + sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43"; + }; + buildInputs = [ + unzip + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + preConfigure = '' + cd angelscript/projects/gnuc + sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" + export SHARED=1 + export VERSION="${s.version}" + mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" + ''; + postBuild = '' + rm ../../lib/* + ''; + postInstall = '' + mkdir -p "$out/share/docs/angelscript" + cp -r ../../../docs/* "$out/share/docs/angelscript" + ''; + meta = { + inherit (s) version; + description = "Light-weight scripting library"; + license = stdenv.lib.licenses.zlib ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; + homepage="http://www.angelcode.com/angelscript/"; + }; +} diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index f5ff0315beef8..84b474b08cb04 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.30.2"; + version = "2.31.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1myp691m0nzv51pyfq6qmjyi0asbkx2v8slrnhj32s6aq55pf24c"; + sha256 = "03a0gmz95di62552dv873iwwy1ym96kpyrc0s708assjlslr9716"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index a9854c7c49347..f71b557bc25d0 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { b=$(basename $f) if [ $b == "mix" ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ + --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 5e2883f9fb3c8..847ae2997b85e 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -51,7 +51,7 @@ sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; - s|-lltdl|-L${libtool}/lib -lltdl|g' + s|-lltdl|-L${libtool.lib}/lib -lltdl|g' ''; # make check doesn't work on darwin diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index fc1f01cb3730c..b12c2c405780e 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = '' - -I${SDL}/include/SDL + -I${SDL.dev}/include/SDL -I${freetype}include/freetype2 ''; diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix index 0dbbaf8a16143..243abae331a63 100644 --- a/pkgs/development/interpreters/lua-5/expat.nix +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlagsArray=( LUA_LDIR="$out/share/lua/${lua5.luaversion}" LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}" - EXPAT_INC="-I${expat}/include"); + EXPAT_INC="-I${expat.dev}/include"); ''; meta = { diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 8b5da0528523a..23ea2fd655288 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString (stdenv.cc.libc != null) '' substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig + --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig ''; configurePhase = false; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 021498300039c..18494708d5294 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -17,7 +17,8 @@ assert enableThreading -> (stdenv ? glibc); let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; - + libcInc = libc.dev or libc; + libcLib = libc.out or libc; common = { version, sha256 }: stdenv.mkDerivation rec { name = "perl-${version}"; @@ -26,7 +27,9 @@ let inherit sha256; }; - outputs = [ "out" "man" ]; + # TODO: Add a "dev" output containing the header files. + outputs = [ "out" "man" "docdev" ]; + setOutputFlags = false; patches = [ # Do not look in /usr etc. for dependencies. @@ -35,17 +38,11 @@ let ++ optional stdenv.isSunOS ./ld-shared.patch ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ]; - # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd - # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them - # while at the same time erasing the PATH environment variable so it unconditionally - # fails. The code in question is guarded by a check for Mac OS, but the patch below - # doesn't have any runtime effect on other platforms. - postPatch = optional stdenv.isDarwin '' + postPatch = '' pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ --replace "/bin/pwd" "$pwd" ''; - sandboxProfile = sandbox.allow "ipc-sysv-sem"; # Build a thread-safe Perl with a dynamic libperls.o. We need the @@ -59,8 +56,8 @@ let "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" - "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" + "-Dlocincpth=${libcInc}/include" + "-Dloclibpth=${libcLib}/lib" ] ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; @@ -77,10 +74,8 @@ let preConfigure = '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - - ${optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} + '' + optionalString stdenv.isArm '' + configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' @@ -94,18 +89,26 @@ let substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" ''; - # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :) - postInstall = '' - self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p") - - sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm - sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl - ''; - setupHook = ./setup-hook.sh; passthru.libPrefix = "lib/perl5/site_perl"; + # TODO: it seems like absolute paths to some coreutils is required. + postInstall = + '' + # Remove dependency between "out" and "man" outputs. + rm "$out"/lib/perl5/*/*/.packlist + + # Remove dependencies on glibc and gcc + sed "/ *libpth =>/c libpth => ' '," \ + -i "$out"/lib/perl5/*/*/Config.pm + # TODO: removing those paths would be cleaner than overwriting with nonsense. + substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ + --replace "${libcInc}" /no-such-path \ + --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \ + --replace "$man" /no-such-path + ''; # */ + meta = { homepage = https://www.perl.org/; description = "The standard implementation of the Perl 5 programmming language"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index cec808ff862fd..e5b0d37a73756 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -30,7 +30,7 @@ let # SAPI modules: apxs2 = { - configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; + configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"]; buildInputs = [apacheHttpd]; }; @@ -44,7 +44,13 @@ let }; ldap = { - configureFlags = ["--with-ldap=${openldap}"]; + configureFlags = [ + "--with-ldap" + "LDAP_DIR=${openldap.dev}" + "LDAP_INCDIR=${openldap.dev}/include" + "LDAP_LIBDIR=${openldap.out}/lib" + "--with-ldap-sasl=${cyrus_sasl.dev}" + ]; buildInputs = [openldap cyrus_sasl openssl]; }; @@ -69,7 +75,7 @@ let libxml2 = { configureFlags = [ - "--with-libxml-dir=${libxml2}" + "--with-libxml-dir=${libxml2.dev}" ]; buildInputs = [ libxml2 ]; }; @@ -148,7 +154,7 @@ let }; openssl = { - configureFlags = ["--with-openssl=${openssl}"]; + configureFlags = ["--enable-openssl"]; buildInputs = [openssl]; }; @@ -290,13 +296,13 @@ let in { php55 = generic { - version = "5.5.33"; - sha256 = "1a8ac1zcq68irvdffh08cpi4aaaira4hsqwgns7b95pm9pnv3464"; + version = "5.5.34"; + sha256 = "0745wn0qg9rqibwr948bzc719s7pywizvl1ahkg1j9m92r28i25g"; }; php56 = generic { - version = "5.6.19"; - sha256 = "0s61fncsdgr1mqgh8jma6pi6xxz4gl350467lk00ls3i97wa691a"; + version = "5.6.20"; + sha256 = "07xz48dz1ijwq45vh90jfzdd56k0s5ppi3j5rwc9p9y7mrybziss"; }; php70 = generic { diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 8abc1ac489cde..095e0b7db08e3 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -25,17 +25,17 @@ let ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; - C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") + C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs); + LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") buildInputs); + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); preConfigure = '' # hint pypy to find nix ncurses substituteInPlace pypy/module/_minimal_curses/fficurses.py \ - --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \ - --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ - --replace "ncurses/term.h" "${ncurses}/include/term.h" \ + --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ --replace "libraries=['curses']" "libraries=['ncurses']" # tkinter hints @@ -44,7 +44,7 @@ let --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \ --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py ''; buildPhase = '' @@ -66,7 +66,7 @@ let doCheck = true; checkPhase = '' - export TERMINFO="${ncurses}/share/terminfo/"; + export TERMINFO="${ncurses.out}/share/terminfo/"; export TERM="xterm"; export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 32974778168b5..96b44ddc17f38 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -52,6 +52,10 @@ let [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; + mkPaths = paths: { + C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths); + LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths); + }; # Build the basic Python interpreter without modules that have # external dependencies. @@ -62,8 +66,7 @@ let inherit majorVersion version src patches buildInputs preConfigure configureFlags; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; @@ -83,9 +86,9 @@ let ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} mv $out/share/man/man1/{python.1,python2.6.1} ln -s $out/share/man/man1/{python2.6.1,python.1} - + paxmark E $out/bin/python${majorVersion} - + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; @@ -139,8 +142,7 @@ let buildInputs = [ python ] ++ deps; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; buildPhase = '' diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index a2c059da06070..f1ae897ea4ac1 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -101,6 +101,11 @@ let propagatedBuildInputs = optional stdenv.isDarwin configd; + mkPaths = paths: { + C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths); + LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths); + }; + # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { @@ -111,8 +116,7 @@ let preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; @@ -137,7 +141,9 @@ let paxmark E $out/bin/python${majorVersion} - ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} + ${optionalString includeModules "$out/bin/python ./setup.py build_ext"} + + rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; passthru = rec { @@ -186,8 +192,7 @@ let buildInputs = [ python ] ++ deps; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then '' diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index f4103662316ec..c0b5d3401ddd3 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation { ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index a8953f38245a0..a46ef7c056b2d 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation { ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index ecada35a26e8c..8d87c6abfbb4e 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation { ''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 0f4b6e744acac..4bc39f4c2b3a7 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation { ''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix index ecaed5077121e..99f66199d939d 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" ''; makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 7573b546164b0..5cc71b59d5123 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; }; + outputs = [ "dev" "out" "lib" ]; + propagatedBuildInputs = [ nspr ]; buildInputs = [ pkgconfig perl python zip libffi readline ]; @@ -21,11 +23,14 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out ''; + setOutputFlags = false; configureFlags = [ + "--libdir=$(lib)/lib" + "--includedir=$(dev)/include" "--enable-threadsafe" "--with-system-nspr" "--with-system-ffi" @@ -49,7 +54,10 @@ stdenv.mkDerivation rec { paxmark mr jsapi-tests/jsapi-tests ''; - postInstall = ''rm "$out"/lib/*.a''; # halve the output size + postInstall = '' + rm "$lib"/lib/*.a # halve the output size + moveToOutput "bin/js*-config" "$dev" # break the cycle + ''; meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index a036388f15eed..94f070d1a91d3 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/js/src"; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out ''; diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 3a9bd8ad7a462..5c4fc85081551 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"; }; + outputs = [ "dev" "out" "lib" ]; + propagatedBuildInputs = [ nspr ]; buildInputs = [ pkgconfig perl python zip libffi readline ]; @@ -21,11 +23,14 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/js/src"; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" export LIBXUL_DIST=$out ''; + setOutputFlags = false; configureFlags = [ + "--libdir=$(lib)/lib" + "--includedir=$(dev)/include" "--enable-threadsafe" "--with-system-nspr" "--with-system-ffi" @@ -40,6 +45,11 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + postInstall = '' + rm "$lib"/lib/*.a # halve the output size + moveToOutput "bin/js*-config" "$dev" # break the cycle + ''; + meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7ca594e9bc4a3..6c3920ff8aa86 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; - outputs = [ "out" "man" ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkgconfig ]; @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { "--disable-osmesa-shared" ] ++ stdenv.lib.optionals (stdenv ? cross) ([ "--without-x" - ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); patches = [ # Fix window resizing issues, e.g. for xmonad @@ -96,6 +97,8 @@ stdenv.mkDerivation rec { }) ]; + postFixup = ''moveToOutput share/aclocal "$dev" ''; + passthru = { inherit openglSupport; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 529c485930b3f..1c260c2ba911a 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -19,7 +19,7 @@ let configureFlagsFun = attrs: '' --disable-oss --disable-x11-shared --disable-pulseaudio-shared --disable-alsa-shared - ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} + ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""} ${if (!x11Support) then "--without-x" else ""} ''; in diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index d7dcbeba330b6..7ddb78d052e09 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -8,16 +8,30 @@ stdenv.mkDerivation { sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; + outputs = [ "dev" "out" "bin" "doc" ]; + setOutputFlags = false; # Doesn't support all the flags + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + # The fuloong2f is not supported by aalib still preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} . + configureFlagsArray+=( + "--bindir=$bin/bin" + "--includedir=$dev/include" + "--libdir=$out/lib" + ) ''; buildInputs = [ ncurses ]; configureFlags = "--without-x --with-ncurses=${ncurses}"; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + postInstall = '' + mkdir -p $dev/bin + mv $bin/bin/aalib-config $dev/bin/aalib-config + substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" + ''; meta = { description = "ASCII art graphics library"; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e2e5f079606b0..e82d37f1d3c78 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen pkgconfig ]; configurePhase = '' + runHook preConfigure qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake + runHook postConfigure ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index f6445874913a4..29b31a8b492c2 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"; }; + outputs = [ "dev" "out" "bin" "doc" ]; + nativeBuildInputs = [ gettext ]; buildInputs = [ attr ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index c123740f5c12e..6f0956f1d1d17 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + buildInputs = optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ] @@ -42,7 +45,10 @@ stdenv.mkDerivation rec { # Give apr1 access to sed for runtime invocations postInstall = '' - wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin" + for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do + substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" + done + wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin" ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 08fd1fe4d5f39..c6e505f43d231 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + + preConfigure = + '' + configureFlagsArray+=("--with-installbuilddir=$dev/share/build") + ''; + configureFlags = # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 @@ -17,10 +25,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.all; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 808de07c52fd2..e49569bc226ae 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0afn4x04j5l352vj0dccb2hkpzg3l2vhr8h1yv89fpqmjkfnm8md"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" ]; buildInputs = [ python pkgconfig popt intltool dbus_glib diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index dcb90aa16cd18..14e2e71c0bd0b 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b"; }; + enableParallelBuilding = true; + + outputs = [ "dev" "out" ]; + buildInputs = libintlOrEmpty; nativeBuildInputs = [ pkgconfig perl ]; @@ -20,8 +24,6 @@ stdenv.mkDerivation rec { #doCheck = true; # no checks in there (2.10.0) - postInstall = "rm -rf $out/share/gtk-doc"; - meta = { description = "Accessibility toolkit"; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 3c69a7328b23b..2bb5b2d258070 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; }; + outputs = [ "dev" "out" "bin" "doc" ]; + nativeBuildInputs = [ gettext ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 158f4b227dd32..4839bedd8bb06 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -7,9 +7,10 @@ stdenv.mkDerivation rec { url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; - patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; + outputs = [ "dev" "out" "doc" ]; + configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; @@ -19,6 +20,12 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. dontStrip = stdenv ? cross; + postInstall = + '' + mkdir -p $out/share/doc + mv $out/share/gc $out/share/doc/gc + ''; + meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b28668e7b3013..5b0c06bd6bb2a 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -64,8 +64,8 @@ let ] ++ optional (variant == "release") "debug-symbols=off"; nativeB2Flags = [ - "-sEXPAT_INCLUDE=${expat}/include" - "-sEXPAT_LIBPATH=${expat}/lib" + "-sEXPAT_INCLUDE=${expat.dev}/include" + "-sEXPAT_LIBPATH=${expat.out}/lib" ] ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null) "--user-config=user-config.jam"; nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); @@ -148,7 +148,7 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags ++ [ - "--with-icu=${icu}" + "--with-icu=${icu.dev}" "--with-python=${python.interpreter}" ] ++ optional (toolset != null) "--with-toolset=${toolset}"; @@ -159,6 +159,7 @@ stdenv.mkDerivation { postFixup = fixup; outputs = [ "out" "dev" "lib" ]; + setOutputFlags = false; crossAttrs = rec { buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index b3fd76ab20c1a..dd185f21035d5 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "28"; - sha256 = "0cjr3zkara8js1fbm8ddcbd5mkizxh1wm6fja13psw5j8mpwj554"; + revision = "29"; + sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176"; openssl = null; }) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 6320dd58e4c6c..541115b1ff16e 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, cmake, mesa, freeglut }: +{ stdenv, fetchFromGitHub, cmake, mesa, freeglut }: stdenv.mkDerivation rec { - name = "bullet-2.80"; # vdrift 2012-07-22 doesn't build with 2.81 - rev = "2531"; - src = fetchurl { - url = "http://bullet.googlecode.com/files/${name}-rev${rev}.tgz"; - sha256 = "0dig6k88jz5y0cz6dn186vc4l96l4v56zvwpsp5bv9f5wdwjskj6"; + name = "bullet-${version}"; + version = "2.83.7"; + + src = fetchFromGitHub { + owner = "bulletphysics"; + repo = "bullet3"; + rev = version; + sha256 = "1zz3vs6i5975y9mgb1k1vxrjbf1028v0nc11p646dsvv2vplxx5r"; }; buildInputs = [ cmake mesa freeglut ]; - configurePhase = '' - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF \ - -DCMAKE_INSTALL_PREFIX=$out . - ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_CPU_DEMOS=OFF" ]; + + enableParallelBuilding = true; meta = { description = "A professional free 3D Game Multiphysics Library"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 537107f3f6a8f..2e4821b307381 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; # very small + nativeBuildInputs = [ pkgconfig libiconv @@ -29,12 +32,12 @@ stdenv.mkDerivation rec { ]); propagatedBuildInputs = - with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] + with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ] ++ optional (!stdenv.isDarwin) libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optionals glSupport [ mesa_noglu ] - ; + ++ optional glSupport mesa_noglu + ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ "--disable-dependency-tracking" @@ -50,29 +53,24 @@ stdenv.mkDerivation rec { preConfigure = # On FreeBSD, `-ldl' doesn't exist. - (stdenv.lib.optionalString stdenv.isFreeBSD + stdenv.lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t mv t "$i" done - '') - + + '' + + '' # Work around broken `Requires.private' that prevents Freetype # `-I' flags to be propagated. sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' ''; enableParallelBuilding = true; - # The default `--disable-gtk-doc' is ignored. - postInstall = "rm -rf $out/share/gtk-doc" - + stdenv.lib.optionalString stdenv.isDarwin ('' - #newline - '' + glib.flattenInclude - ); + postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix index 5eb12fe299891..ae202b0937773 100644 --- a/pkgs/development/libraries/cogl/1.20.nix +++ b/pkgs/development/libraries/cogl/1.20.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix index ce4fda5bd4686..88bb670774906 100644 --- a/pkgs/development/libraries/cogl/1.22.nix +++ b/pkgs/development/libraries/cogl/1.22.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index a4a20fce023aa..e457020906650 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 059b0ab0042ae..21ad12869f9c8 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; + outputs = [ "dev" "bin" "out" "man" "docdev" ]; + buildInputs = [ openssl db gettext kerberos ] ++ lib.optional stdenv.isFreeBSD autoreconfHook @@ -39,6 +41,12 @@ stdenv.mkDerivation rec { installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; + postInstall = '' + for f in $out/lib/*.la $out/lib/sasl2/*.la; do + substituteInPlace $f --replace "${openssl.dev}/lib" "${openssl.out}/lib" + done + ''; + meta = { homepage = "http://cyrusimap.web.cmu.edu/"; description = "library for adding authentication support to connection-based protocols"; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 480dc61897bb5..59d227f0e8689 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ expat libiconv ]; - propagatedBuildInputs = [ dbus.libs glib ]; + propagatedBuildInputs = [ dbus glib ]; doCheck = true; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 7f5e2f6311b27..83635d9739f18 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook -, expat, systemd, glib, dbus_glib, python +{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: assert x11Support -> libX11 != null @@ -10,108 +9,77 @@ let version = "1.8.20"; sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw"; - inherit (stdenv) lib; - - buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ]; - - # also other parts than "libs" need this statically linked lib - makeInternalLib = "(cd dbus && make libdbus-internal.la)"; - - systemdOrEmpty = lib.optional stdenv.isLinux systemd; - - # A generic builder for individual parts (subdirs) of D-Bus - dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{ - - name = "dbus-${name}-${version}"; +self = stdenv.mkDerivation { + name = "dbus-${version}"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; inherit sha256; }; - patches = [ - ./ignore-missing-includedirs.patch - ./ucred-dirty-hack.patch - ./no-create-dirs.patch - ] - ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch - ; - - # build only the specified subdirs - postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n" - # use already packaged libdbus instead of trying to build it again - + lib.optionalString (name != "libs") '' - for mfile in */Makefile.am; do - sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile" - done - ''; - - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - propagatedBuildInputs = [ expat ]; - - preAutoreconf = '' - substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:' + patches = [ ./ignore-missing-includedirs.patch ] + ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + postPatch = '' + substituteInPlace tools/Makefile.in \ + --replace 'install-localstatelibDATA:' 'disabled:' \ + --replace 'install-data-local:' 'disabled:' \ + --replace 'installcheck-local:' 'disabled:' + substituteInPlace bus/Makefile.in \ + --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' + '' + /* cleanup of runtime references */ '' + substituteInPlace ./dbus/dbus-sysdeps-unix.c \ + --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" + substituteInPlace ./tools/dbus-launch.c \ + --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' ''; - preConfigure = '' - patchShebangs . - ''; + outputs = [ "dev" "out" "lib" "doc" ]; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ expat ]; + buildInputs = lib.optional stdenv.isLinux systemd + ++ lib.optionals x11Support [ libX11 libICE libSM ]; + # ToDo: optional selinux? configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + # this package installs nothing into those dirs and they create a dependency + "--datadir=/run/current-system/sw/share" + "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper ] ++ lib.optional (!x11Support) "--without-x"; - enableParallelBuilding = true; - - doCheck = true; - - installFlags = "sysconfdir=$(out)/etc"; - - } merge ]); - - libs = dbus_drv "libs" "dbus" { # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. - NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - buildInputs = [ systemdOrEmpty ]; - meta.platforms = stdenv.lib.platforms.all; - }; - - - attrs = rec { - # If you change much fix indentation + # problems building without x11Support so disabled in that case for now + NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed"; - # This package has been split because most applications only need dbus.lib - # which serves as an interface to a *system-wide* daemon, - # see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture . + enableParallelBuilding = true; - inherit libs; + doCheck = true; - tools = dbus_drv "tools" "tools bus" { - preBuild = makeInternalLib; - buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ]; - NIX_CFLAGS_LINK = - stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.isSunOS) "-Wl,--as-needed " - + "-ldbus-1"; + installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share"; - # don't provide another dbus-1.pc (with incorrect include and link dirs), - # also remove useless empty dirs - postInstall = '' - rm "$out"/lib/pkgconfig/dbus-1.pc - rmdir --parents --ignore-fail-on-non-empty "$out"/{lib/pkgconfig,share/dbus-1/*} + # it's executed from $lib by absolute path + postFixup = '' + moveToOutput bin/dbus-launch "$lib" + ln -s "$lib/bin/dbus-launch" "$out/bin/" ''; - meta.platforms = with stdenv.lib.platforms; allBut darwin; - }; - - daemon = tools; + passthru = { + dbus-launch = "${self.lib}/bin/dbus-launch"; + daemon = self.out; + }; - docs = dbus_drv "docs" "doc" { - postInstall = ''rm -r "$out/lib"''; + meta = with stdenv.lib; { + description = "Simple interprocess messaging system"; + homepage = http://www.freedesktop.org/wiki/Software/dbus/; + license = licenses.gpl2Plus; # most is also under AFL-2.1 + platforms = platforms.unix; + }; }; -}; -in attrs.libs // attrs +in self diff --git a/pkgs/development/libraries/dbus/no-create-dirs.patch b/pkgs/development/libraries/dbus/no-create-dirs.patch deleted file mode 100644 index cf10d97759918..0000000000000 --- a/pkgs/development/libraries/dbus/no-create-dirs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bus/Makefile.am b/bus/Makefile.am -index 6cbc09a..be60bb8 100644 ---- a/bus/Makefile.am -+++ b/bus/Makefile.am -@@ -212,7 +212,6 @@ clean-local: - /bin/rm *.bb *.bbg *.da *.gcov || true - - install-data-hook: -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services -diff --git a/tools/Makefile.am b/tools/Makefile.am -index cfd54b8..b6e28f9 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -74,7 +74,7 @@ CLEANFILES = \ - - # create the /var/lib/dbus directory for dbus-uuidgen - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus -+ : - - installcheck-local: -- test -d $(DESTDIR)$(localstatedir)/lib/dbus -+ : diff --git a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch deleted file mode 100644 index a07abcc15fb0e..0000000000000 --- a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index b4ecc96..267984a 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -1635,6 +1635,13 @@ write_credentials_byte (int server_fd, - } - } - -+struct ucred -+{ -+ pid_t pid; /* PID of sending process. */ -+ uid_t uid; /* UID of sending process. */ -+ gid_t gid; /* GID of sending process. */ -+}; -+ - /** - * Reads a single byte which must be nul (an error occurs otherwise), - * and reads unix credentials if available. Clears the credentials diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index daffae90b1273..009624096605f 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; buildInputs = [ mesa libX11 ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 96d46649d9168..774190278cb31 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -10,8 +10,13 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2015-1283.patch ]; + outputs = [ "dev" "out" ]; # TODO: fix referrers + outputBin = "dev"; + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + outputMan = "dev"; # tiny page for a dev tool + meta = with stdenv.lib; { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index c62278729a7f4..d50c20331e4a9 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, xvidcore, zlib, libopus +, x264, x265, xvidcore, zlib, libopus , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -71,6 +71,10 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; + outputs = [ "dev" "out" "bin" ] + ++ optional (reqMin "1.0") "doc" ; # just dev-doc + setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! + configureFlags = [ # License "--enable-gpl" @@ -129,6 +133,7 @@ stdenv.mkDerivation rec { "--enable-libxvid" "--enable-zlib" (ifMinVer "2.8" "--enable-libopus") + (ifMinVer "2.8" "--enable-libx265") # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -142,7 +147,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libopus + libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva @@ -154,6 +159,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postFixup = '' + moveToOutput bin "$bin" + moveToOutput share/ffmpeg/examples "$doc" + ''; + /* Cross-compilation is untested, consider this an outline, more work needs to be done to portions of the build to get it to work correctly */ crossAttrs = let @@ -183,6 +193,8 @@ stdenv.mkDerivation rec { ]; }; + installFlags = [ "install-man" ]; + passthru = { vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false; inherit vdpauSupport; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index dfa4541e34b73..a7a02521c69c2 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; }; + outputs = [ "dev" "out" "doc" ]; # it's dev-doc only + outputBin = "dev"; # fftw-wisdom + configureFlags = [ "--enable-shared" "--disable-static" "--enable-threads" diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 2951dbb44d4f4..fea9efde1cfd2 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { } ; + outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config + propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index b03528de2d5db..6acf1ebce29c5 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { }) ]; + outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config + propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" rm conf.d/{50-user,51-local}.conf - "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ + "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ --stringparam fontconfig "$out" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 1321948c3c818..b996cd228c77d 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -16,7 +16,7 @@ runCommand "fc-cache" <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> - <include>${fontconfig}/etc/fonts/fonts.conf</include> + <include>${fontconfig.out}/etc/fonts/fonts.conf</include> <cachedir>$out</cachedir> EOF cat "$fontDirsPath" >> fonts.conf diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 2b02e0df7a04c..2d0a21ea9ddfe 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -8,9 +8,9 @@ runCommand "fonts.conf" } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ - --stringparam fontconfig "${fontconfig}" \ + --stringparam fontconfig "${fontconfig.out}" \ --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \ - --path ${fontconfig}/share/xml/fontconfig \ - ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \ + --path ${fontconfig.out}/share/xml/fontconfig \ + ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \ > $out '' diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 61d8cb582a01b..81e98056e90b2 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -35,12 +35,16 @@ stdenv.mkDerivation rec { "0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8") ]; + outputs = [ "dev" "out" ]; + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence buildInputs = [ pkgconfig which ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; + configureFlags = "--disable-static --bindir=$(dev)/bin"; + # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; # The asm for armel is written with the 'asm' keyword. diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 18562d1d12e32..756ebf8161990 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -13,12 +13,17 @@ stdenv.mkDerivation rec { sha256 = "0cfh87aqyqbfcwpbv1ihgmgfcn66il5q2n8yjyl8gxkjmkqp2rrb"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + setupHook = ./setup-hook.sh; + enableParallelBuilding = true; + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 libintlOrEmpty ]; + buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; @@ -34,12 +39,11 @@ stdenv.mkDerivation rec { # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit (doCheck); - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { + meta = with stdenv.lib; { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.eelco ]; + platforms = platforms.unix; }; } + diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 83becae05a4c4..0c22cc9ff9fdb 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.4.2"; + name = "geoclue-2.4.3"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "0g4krigdaf5ipkp4mi16rca62crr8pdk3wkhm0fxbcqnil75fyy4"; + sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; }; buildInputs = diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 2fcd5dd1a80b6..b75e85cbea509 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; - buildInputs = [ xz ] ++ lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz xz.bin libiconv ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index fb380d60cf924..3cf429ab1d739 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv}: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: stdenv.mkDerivation (rec { version = "0.23.2"; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 6bb3c8c1e5a2e..fc4707aedb75b 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"; }; + outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; preBuild = '' - sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) + sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9dd927d55ced8..120d398bd44d6 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -31,12 +31,12 @@ let # This is intended to be run in postInstall of any package # which has $out/include/ containing just some disjunct directories. flattenInclude = '' - for dir in "$out"/include/*; do - cp -r "$dir"/* "$out/include/" + for dir in "''${!outputInclude}"/include/*; do + cp -r "$dir"/* "''${!outputInclude}/include/" rm -r "$dir" ln -s . "$dir" done - ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true + ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; ver_maj = "2.46"; @@ -53,21 +53,22 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + setupHook = ./setup-hook.sh; - buildInputs = [ libelf ] + buildInputs = [ libelf setupHook pcre ] ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi libiconv ] + propagatedBuildInputs = [ zlib libffi libiconv ] ++ libintlOrEmpty; - LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}"; - LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf"; - - configureFlags = - optional stdenv.isDarwin "--disable-compile-warnings" + # internal pcre would only add <200kB, but it's relatively common + configureFlags = [ "--with-pcre=system" ] + ++ optional stdenv.isDarwin "--disable-compile-warnings" ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace"; @@ -79,6 +80,9 @@ stdenv.mkDerivation rec { sed -i -e 's|inotify.h|foobar-inotify.h|g' configure ''; + LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}"; + LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf"; + preBuild = optionalString stdenv.isDarwin '' export MACOSX_DEPLOYMENT_TARGET= @@ -87,6 +91,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; + postInstall = '' + moveToOutput "share/glib-2.0" "$dev" + substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" + sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" + ''; + inherit doCheck; preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" @@ -95,7 +105,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test @@ -109,8 +119,6 @@ stdenv.mkDerivation rec { sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; - postInstall = ''rm -rvf $out/share/gtk-doc''; - passthru = { gioModuleDir = "lib/gio/modules"; inherit flattenInclude; diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index ca7e326bd02e3..c5cf293902cd4 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,5 +1,3 @@ -# Install gschemas, if any, in a package-specific directory -installFlagsArray+=("gsettingsschemadir=$out/share/gsettings-schemas/$name/glib-2.0/schemas/") make_glib_find_gsettings_schemas() { # For packages that need gschemas of other packages (e.g. empathy) @@ -7,17 +5,22 @@ make_glib_find_gsettings_schemas() { addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"* fi } - envHooks+=(make_glib_find_gsettings_schemas) +# Install gschemas, if any, in a package-specific directory +glibPreInstallPhase() { + installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/") +} +preInstallPhases+=(glibPreInstallPhase) + glibPreFixupPhase() { # Move gschemas in case the install flag didn't help - if [ -d "$out/share/glib-2.0/schemas" ]; then - mkdir -p "$out/share/gsettings-schemas/$name/glib-2.0" - mv "$out/share/glib-2.0/schemas" "$out/share/gsettings-schemas/$name/glib-2.0/" + if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then + mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" + mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" fi - addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name" + addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" } +preFixupPhases+=(glibPreFixupPhase) -preFixupPhases="$preFixupPhases glibPreFixupPhase" diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh index d60b143a1ecab..85f27c7b3559f 100644 --- a/pkgs/development/libraries/glibc/builder.sh +++ b/pkgs/development/libraries/glibc/builder.sh @@ -12,8 +12,10 @@ postConfigure() { export NIX_DONT_SET_RPATH=1 unset CFLAGS -} + # Apparently --bindir is not respected. + makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") +} postInstall() { if test -n "$installLocales"; then @@ -25,7 +27,7 @@ postInstall() { if test -n "$linuxHeaders"; then # Include the Linux kernel headers in Glibc, except the `scsi' # subdirectory, which Glibc provides itself. - (cd $out/include && \ + (cd $dev/include && \ ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .) fi @@ -41,6 +43,16 @@ postInstall() { for i in $out/lib/*.a; do strip -S "$i" done + # Put libraries for static linking in a separate output. Note + # that libc_nonshared.a and libpthread_nonshared.a are required + # for dynamically-linked applications. + mkdir -p $static/lib + mv $out/lib/*.a $static/lib + mv $static/lib/lib*_nonshared.a $out/lib + + # Work around a Nix bug: hard links across outputs cause a build failure. + cp $bin/bin/getconf $bin/bin/getconf_ + mv $bin/bin/getconf_ $bin/bin/getconf } genericBuild diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 13d5adcd9b133..893f65c3e205f 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -112,6 +112,8 @@ stdenv.mkDerivation ({ installFlags = [ "sysconfdir=$(out)/etc" ]; + outputs = [ "dev" "out" "bin" "static" ]; + buildInputs = lib.optionals (cross != null) [ gccCross ] ++ lib.optionals withGd [ gd libpng ]; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index d6c7121dad05f..a164c21890ed9 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -66,7 +66,7 @@ in # To avoid a dependency on the build system 'bash'. preFixup = '' - rm $out/bin/{ldd,tzselect,catchsegv,xtrace} + rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} ''; } else {})) diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix index 1e60856430db1..84ec43e11a85f 100644 --- a/pkgs/development/libraries/glibc/info.nix +++ b/pkgs/development/libraries/glibc/info.nix @@ -8,6 +8,8 @@ build null { inherit fetchurl stdenv lib; + outputs = [ "out" ]; + configureFlags = [ "--enable-add-ons" ]; buildInputs = [ texinfo perl ]; diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 9607d7ecb2230..994390cf82901 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -18,6 +18,8 @@ build null { builder = ./locales-builder.sh; + outputs = [ "out" ]; + # Awful hack: `localedef' doesn't allow the path to `locale-archive' # to be overriden, but you *can* specify a prefix, i.e. it will use # <prefix>/<path-to-glibc>/lib/locale/locale-archive. So we use @@ -25,7 +27,7 @@ build null { # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. buildPhase = '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale" # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index b5b4eabe9c74b..0d7bed99f22f0 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -3,32 +3,26 @@ let nameVersion = builtins.parseDrvName glibc.name; + glibc64 = glibc; in runCommand "${nameVersion.name}-multi-${nameVersion.version}" - { inherit glibc32; - glibc64 = glibc; - } + { outputs = [ "dev" "out" "bin" ]; } # TODO: no static version here (yet) '' - mkdir -p $out - ln -s $glibc64/* $out/ - - rm $out/lib $out/lib64 - mkdir -p $out/lib - ln -s $glibc64/lib/* $out/lib - ln -s $glibc32/lib $out/lib/32 - ln -s lib $out/lib64 + mkdir -p "$out/lib" + ln -s '${glibc64.out}'/lib/* "$out/lib" + ln -s '${glibc32.out}/lib' "$out/lib/32" + ln -s lib "$out/lib64" # fixing ldd RLTDLIST - rm $out/bin - cp -rs $glibc64/bin $out - chmod u+w $out/bin - rm $out/bin/ldd + mkdir -p "$bin/bin" + cp -s '${glibc64.bin}'/bin/* "$bin/bin/" + rm "$bin/bin/ldd" sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-linux-x86-64.so.2 $out/lib/32/ld-linux.so.2\"|g" \ - $glibc64/bin/ldd > $out/bin/ldd - chmod 555 $out/bin/ldd + '${glibc64.bin}/bin/ldd' > "$bin/bin/ldd" + chmod +x "$bin/bin/ldd" - rm $out/include - cp -rs $glibc32/include $out - chmod -R u+w $out/include - cp -rsf $glibc64/include $out + mkdir "$dev" + cp -rs '${glibc32}'/include "$dev/" + chmod +w -R "$dev" + cp -rsf '${glibc64}'/include "$dev/" '' diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 6564fc5118675..ee81aec07976d 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -8,9 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; + enableParallelBuilding = true; + meta = { homepage = http://spruce.sourceforge.net/gmime/; description = "A C/C++ library for manipulating MIME messages"; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 5f20d66768e23..ad3f0da981f98 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m"; }; + outputs = [ "out" "info" ]; + nativeBuildInputs = [ m4 ]; # FIXME needs gcc 4.9 in bootstrap tools diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5025557458cd3..a7443c02c5b6c 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: +{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: with { inherit (stdenv.lib) optional optionalString; }; -stdenv.mkDerivation rec { +let self = stdenv.mkDerivation rec { name = "gmp-6.1.0"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1s3kddydvngqrpc6i1vbz39raya2jdcl042wi0ksbszgjjllk129"; }; + #outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5; + # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added + # - see #5855 for related discussion + outputs = [ "dev" "out" "info" ]; + passthru.static = self.out; + nativeBuildInputs = [ m4 ]; configureFlags = @@ -69,4 +75,5 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.simons ]; }; -} +}; + in self diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index e51b77eb5b07c..b54ea52b880bf 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { inherit src patches postPatch; - outputs = [ "out" "man" ]; + outputs = [ "dev" "out" "bin" "man" "docdev" ]; + outputInfo = "docdev"; configureFlags = lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" @@ -34,8 +35,6 @@ stdenv.mkDerivation { ++ [ unbound ] ++ lib.optional guileBindings guile; - # AutoreconfHook is temporary until the patch lands upstream to fix - # header file generation with parallel building nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; # XXX: Gnulib's `test-select' fails on FreeBSD: @@ -45,9 +44,10 @@ stdenv.mkDerivation { # Fixup broken libtool and pkgconfig files preFixup = lib.optionalString (!stdenv.isDarwin) '' sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ - -e 's,-lz,-L${zlib}/lib -lz,' \ - -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ - -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc + -e 's,-lz,-L${zlib.out}/lib -lz,' \ + -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \ + -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \ + -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc" ''; meta = with lib; { diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index e13ce337f3885..47ccb17e48459 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -19,20 +19,21 @@ stdenv.mkDerivation rec { sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233"; }; - buildInputs = [ flex bison pkgconfig python ] + outputs = [ "dev" "out" ]; + outputBin = "dev"; + outputMan = "dev"; # tiny pages + + buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ] ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; - # The '--disable-tests' flag is no longer recognized, so can be safely removed - # next time this package changes. - configureFlags = [ "--disable-tests" ]; - preConfigure = '' sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in ''; - postInstall = "rm -rf $out/share/gtk-doc"; + # outputs TODO: share/gobject-introspection-1.0/tests is needed during build + # by pygobject3 (and maybe others), but it's only searched in $out setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index d411ad69dc43f..583d8475ec3b4 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -12,3 +12,10 @@ make_gobject_introspection_find_gir_files() { } envHooks+=(make_gobject_introspection_find_gir_files) + +_multioutMoveGlibGir() { + moveToOutput share/gir-1.0 "${!outputDev}" +} + +preFixupHooks+=(_multioutMoveGlibGir) + diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 4572387e22521..c60311423233f 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"; }; + outputs = [ "dev" "out" "info" ]; + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool + propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; nativeBuildInputs = [ pkgconfig gnupg ]; @@ -25,11 +28,11 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gpgStorePath}/bin" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; description = "Library for making GnuPG easier to use"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 81e5726fa946b..3118caffb11ab 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, libva-full }: rec { gstreamer = callPackage ./core { }; @@ -21,7 +21,10 @@ rec { # (Non Linear Engine). gst-editing-services = callPackage ./ges { inherit gnonlin; }; - gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; + gst-vaapi = callPackage ./vaapi { + inherit gst-plugins-base gstreamer gst-plugins-bad; + libva = libva-full; # looks also for libva-{x11,wayland} + }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index dc39bddc232ff..191c1f6b0f2ce 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, libintlOrEmpty +, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). minimalDeps ? false @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ + --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" + ''; + meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 015aa4e07f5d4..bf061b4125b5a 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva +{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm , libvpx }: @@ -14,8 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; - buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev - xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ]; + buildInputs = [ + gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev + xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx + ]; preConfigure = " export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 8830e1425b68d..d4d4cddb40239 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -15,11 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1f1ifv1ijrda4jx831l24d3ww65v5gf56r464fi11n6k02bcah87"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + enableParallelBuilding = true; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl"; - nativeBuildInputs = [ perl pkgconfig gettext ]; + setupHook = ./setup-hook.sh; + + nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] @@ -35,7 +40,9 @@ stdenv.mkDerivation rec { then "--disable-glibtest --disable-introspection --disable-visibility" else "--with-xinput=yes"; - postInstall = "rm -rf $out/share/gtk-doc"; + postInstall = '' + moveToOutput share/gtk-2.0/demo "$docdev" + ''; passthru = { gtkExeEnvPostBuild = '' diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index f738f76ca0294..a2da4c7b03391 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xorg, wayland, epoxy, json_glib, libxkbcommon, gmp , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , darwin }: -assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; with stdenv.lib; @@ -24,17 +23,22 @@ stdenv.mkDerivation rec { sha256 = "107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + buildInputs = [ libxkbcommon epoxy json_glib ]; + propagatedBuildInputs = with xorg; with stdenv.lib; + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk + libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals stdenv.isLinux [ wayland ] ++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; + #TODO: colord? - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; @@ -49,7 +53,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend" ]; - postInstall = "rm -rf $out/share/gtk-doc"; + postInstall = '' + substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ + --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' + ''; passthru = { gtkExeEnvPostBuild = '' @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { ''; # workaround for bug of nix-mode for Emacs */ ''; }; - meta = { + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' @@ -74,9 +81,9 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ urkud raskin vcunat lethalman ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk+/setup-hook.sh new file mode 100644 index 0000000000000..c2b0ab502db7e --- /dev/null +++ b/pkgs/development/libraries/gtk+/setup-hook.sh @@ -0,0 +1,10 @@ +fixupOutputHooks+=(_gtk2CleanComments) + +# Clean comments that link to generator of the file +_gtk2CleanComments() { + local f="$prefix/lib/gtk-2.0/2.10.0/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} + diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 6145c8c494773..45f5217d3c91b 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' ln -sv ${libsoup}/include/*/libsoup $out/include - ln -sv ${libxml2}/include/*/libxml $out/include + ln -sv ${libxml2.dev}/include/*/libxml $out/include ln -sv ${gssdp}/include/*/libgssdp $out/include ''; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index d2a958faed8bd..37403f50e2b10 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libtool ]; buildInputs = - [ makeWrapper glib dbus.libs udev libgudev udisks2 libgcrypt + [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio libxml2 libxslt docbook_xsl samba libmtp # ToDo: a ligther version of libsoup to have FTP/HTTP support? diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d2546ebd496d7..2d84b1e73a829 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,38 +1,49 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty -, icu, graphite2 +, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it }: -# TODO: split non-icu and icu lib into different outputs? -# (icu is a ~30 MB dependency, the rest is very small in comparison) +let + version = "1.1.2"; + inherit (stdenv.lib) optional optionals optionalString; +in -stdenv.mkDerivation rec { - name = "harfbuzz-1.1.2"; +stdenv.mkDerivation { + name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; + url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" ]; + outputBin = "dev"; configureFlags = [ ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default ( "--with-icu=" + (if withIcu then "yes" else "no") ) ]; - buildInputs = [ pkgconfig glib freetype cairo ] # recommended by upstream + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib freetype cairo ] # recommended by upstream ++ libintlOrEmpty; propagatedBuildInputs = [] - ++ stdenv.lib.optional withGraphite2 graphite2 - ++ stdenv.lib.optional withIcu icu + ++ optional withGraphite2 graphite2 + ++ optionals withIcu [ icu harfbuzz ] ; - meta = { + # Slightly hacky; some pkgs expect them in a single directory. + postInstall = optionalString withIcu '' + rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" + ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la + ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc + ''; + + meta = with stdenv.lib; { description = "An OpenType text shaping engine"; homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ maintainers.eelco ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 14d36ef53157f..d48c598dd92d7 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -8,8 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7"; }; - propagatedBuildInputs = [ ncurses readline ]; - configureFlags = "--with-ui --with-readline"; + outputs = [ "dev" "out" "bin" "man" ]; + + buildInputs = [ ncurses readline ]; + configureFlags = [ "--with-ui" "--with-readline" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index 88f18e6283de2..3793a14b4dccf 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = (appendToName "with-dicts" hunspell).name; buildInputs = [ makeWrapper ]; buildCommand = '' - makeWrapper ${hunspell}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} + makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; inherit (hunspell) meta; } \ No newline at end of file diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 224e9302baa65..d2604b03f74f8 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation ({ sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + makeFlags = stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-headerpad_max_install_names"; @@ -37,6 +40,8 @@ stdenv.mkDerivation ({ sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc ''; + postFixup = ''moveToOutput lib/icu "$dev" ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 40d54ed400a3b..50bebca6b3128 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xorg, libjpeg }: +{ stdenv, fetchurl, unzip, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { name = "jasper-1.900.1"; @@ -18,11 +18,16 @@ stdenv.mkDerivation rec { ./jasper-CVE-2014-9029.diff ]; - nativeBuildInputs = [unzip]; + # newer reconf to recognize a multiout flag + nativeBuildInputs = [ unzip autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; + outputs = [ "dev" "out" "man" "bin" ]; + + enableParallelBuilding = true; + meta = { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix new file mode 100644 index 0000000000000..05ad908b3c361 --- /dev/null +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "lombok-1.16.8"; + src = fetchurl { + url = "https://projectlombok.org/downloads/${name}.jar"; + sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy"; + }; + phases = [ "installPhase" ]; + installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar"; + meta = { + description = "A library that can write a lot of boilerplate for your Java project"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + homepage = https://projectlombok.org/; + maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; + }; +} diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh deleted file mode 100644 index 9f678d7158bb9..0000000000000 --- a/pkgs/development/libraries/java/swt/builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -source $stdenv/setup - -unzip $src src.zip -unzip src.zip - -export JAVA_HOME=${jdk} -echo $JAVA_HOME=${jdk} -sh ./build.sh make_swt make_atk - -mkdir -p $out/lib -cp *.so $out/lib - -mkdir out -javac -d out/ $(find org/ -name "*.java") - -mkdir -p $out/jars -cp version.txt out/ -cd out && jar -c * > $out/jars/swt.jar diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 9fcffb1edb23e..e45121032d58c 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, unzip, jdk, pkgconfig, gtk -, libXtst -, libXi -, mesa -, webkit -, libsoup +, libXtst, libXi, mesa, webkit, libsoup, xorg +, pango, gdk_pixbuf, glib }: let @@ -26,8 +23,6 @@ in stdenv.mkDerivation rec { fullVersion = "${version}-201202080800"; name = "swt-${version}"; - builder = ./builder.sh; - hardeningDisable = [ "format" ]; # Alas, the Eclipse Project apparently doesn't produce source-only @@ -38,6 +33,41 @@ in stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - buildInputs = [unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup]; - inherit jdk; + sourceRoot = "."; + + buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ]; + + NIX_LFLAGS = [ "-lX11" "-I${xorg.libX11}/lib" + "-lpango-1.0" "-I${pango}/lib" + "-lgdk_pixbuf-2.0" "-I${gdk_pixbuf}/lib" + "-lglib-2.0" "-I${glib}/lib"]; + + buildPhase = '' + unzip src.zip -d src + + cd src + sed -i "s#^LFLAGS =#LFLAGS = $NIX_LFLAGS #g" *.mak + export JAVA_HOME=${jdk} + + sh ./build.sh + + mkdir out + javac -d out/ $(find org/ -name "*.java") + ''; + + installPhase = '' + mkdir -p $out/lib + cp *.so $out/lib + + mkdir -p $out/jars + cp version.txt out/ + cd out && jar -c * > $out/jars/swt.jar + ''; + + meta = with stdenv.lib; { + homepage = http://www.eclipse.org/swt/; + description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented"; + license = licenses.epl10; + maintainers = with maintainers; [ pSub ]; + }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index ad425f2a38123..d5e0694e0516f 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { patches = [ ./unused-variable.patch ]; - buildInputs = [ autoreconfHook ]; # won't configure without it, no idea why + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why # compatibility hack (for mypaint at least) postInstall = '' - ln -s json-c.pc "$out/lib/pkgconfig/json.pc" + ln -s json-c.pc "$dev/lib/pkgconfig/json.pc" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix new file mode 100644 index 0000000000000..98721876c1204 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix new file mode 100644 index 0000000000000..38c41d9271d86 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix new file mode 100644 index 0000000000000..f981b0516f720 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix new file mode 100644 index 0000000000000..44cc99daf261b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix @@ -0,0 +1,10 @@ +{ kdeFramework +, extra-cmake-modules +, qtsvg +}: + +kdeFramework { + name = "breeze-icons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtsvg ]; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix new file mode 100644 index 0000000000000..bb96048d6ff56 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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; }; + + packages = self: with self; { + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + outputs = args.outputs or [ "dev" "out" ]; + + 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 {}); + }); + + 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 {}; + 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 {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio {}; + 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 {}; + }; + +in packages diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix new file mode 100644 index 0000000000000..1c2ea70442d32 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix @@ -0,0 +1,20 @@ +{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }: + +kdeFramework { + name = "extra-cmake-modules"; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" ]; # this package has no runtime components + 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 = with lib; { + license = licenses.bsd2; + maintainers = [ maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch new file mode 100644 index 0000000000000..a74340a6dc969 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch @@ -0,0 +1,37 @@ +Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake +=================================================================== +--- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake ++++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake +@@ -200,32 +200,6 @@ + # GNUInstallDirs code deals with re-configuring, but that is dealt with + # by the _define_* macros in this module). + 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 diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series new file mode 100644 index 0000000000000..b4569e50a5f73 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series @@ -0,0 +1 @@ +nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh new file mode 100644 index 0000000000000..56ed09f4ea59e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,81 @@ +_ecmSetXdgDirs() { + addToSearchPathOnce XDG_DATA_DIRS "$1/share" + addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg" +} + +_ecmPropagateSharedData() { + local sharedPaths=( \ + "config.cfg" \ + "doc" \ + "kconf_update" \ + "kservices5" \ + "kservicetypes5" \ + "kxmlgui5" \ + "knotifications5" \ + "icons" \ + "sounds" \ + "templates" \ + "wallpapers" \ + "applications" \ + "desktop-directories" \ + "mime" \ + "info" \ + "dbus-1" \ + "interfaces" \ + "services" \ + "system-services" ) + for dir in ${sharedPaths[@]}; do + if [ -d "$1/share/$dir" ]; then + addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" + propagateOnce propagatedUserEnvPkgs "$1" + break + fi + done +} + +_ecmConfig() { + # Because we need to use absolute paths here, we must set *all* the paths. + cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" + cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" + cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports" + cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml" + cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" + cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share" + cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share" + cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML" + cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg" + cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update" + cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5" + cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5" + cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5" + cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5" + cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons" + cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds" + cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates" + cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers" + cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications" + cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories" + cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages" + cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata" + cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man" + cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info" + cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1" + cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces" + cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services" + cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services" + cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc" + cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg" + cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart" +} + +envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData) +preConfigureHooks+=(_ecmConfig) diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh new file mode 100755 index 0000000000000..7937e6f8bed92 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/" +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 <<EOF +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ +EOF + +gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do + versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv) + latestVersion=$(echo "$versions" | sort -rV | head -n 1) + src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv) + filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv) + url="${src:2}" + sha256=$(nix-hash --type sha256 --base32 --flat "$src") + cat >>../srcs.nix <<EOF + $name = { + version = "$latestVersion"; + src = fetchurl { + url = "\${mirror}/$url"; + sha256 = "$sha256"; + name = "$filename"; + }; + }; +EOF +done + +echo "}" >>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix new file mode 100644 index 0000000000000..26987c385ad5d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix new file mode 100644 index 0000000000000..3225098f43980 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix new file mode 100644 index 0000000000000..647be8f052c39 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix new file mode 100644 index 0000000000000..a8d9a0003c3b8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch new file mode 100644 index 0000000000000..c66f5ecd008f8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch @@ -0,0 +1,17 @@ +Index: kauth-5.18.0/KF5AuthConfig.cmake.in +=================================================================== +--- kauth-5.18.0.orig/KF5AuthConfig.cmake.in ++++ kauth-5.18.0/KF5AuthConfig.cmake.in +@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I + + 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_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") +-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions") ++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}") ++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix new file mode 100644 index 0000000000000..1352d8c5821f5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules +, kcoreaddons +, polkit-qt +}: + +kdeFramework { + name = "kauth"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkit-qt ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series new file mode 100644 index 0000000000000..d2689425c3876 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series @@ -0,0 +1 @@ +cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix new file mode 100644 index 0000000000000..1a469ab4db6da --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..0d861fa95012d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +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.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix new file mode 100644 index 0000000000000..dbbb783ac6152 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix new file mode 100644 index 0000000000000..53a69a69b69c4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix new file mode 100644 index 0000000000000..e393774f16a52 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix new file mode 100644 index 0000000000000..e132afe598866 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..7a6c0ee90534f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +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.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix new file mode 100644 index 0000000000000..0e14d06edd367 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix new file mode 100644 index 0000000000000..f3a1db7bd4841 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix new file mode 100644 index 0000000000000..bbab78ccb4090 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix new file mode 100644 index 0000000000000..d2ceab31d14bb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix new file mode 100644 index 0000000000000..74d107466cfc4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix new file mode 100644 index 0000000000000..47ae2d68c68e4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix new file mode 100644 index 0000000000000..843db83a99b23 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix @@ -0,0 +1,36 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kded, 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"; + outputs = [ "dev" "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kded 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.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch new file mode 100644 index 0000000000000..eabb702544830 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch @@ -0,0 +1,13 @@ +Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +=================================================================== +--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp ++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp +@@ -292,7 +292,7 @@ static QString relativeInstallPath(const + return QFile::decodeName(ICON_INSTALL_DIR "/"); + } + if (strcmp("include", type) == 0) { +- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); ++ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); + } + break; + case 'l': diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series new file mode 100644 index 0000000000000..9b08ab208774a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series @@ -0,0 +1 @@ +nix-kde-include-dir.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh new file mode 100644 index 0000000000000..21ac2e83b5dae --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh @@ -0,0 +1 @@ +export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix new file mode 100644 index 0000000000000..cbc114ccca036 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix new file mode 100644 index 0000000000000..364fbd6a720bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix new file mode 100644 index 0000000000000..d361313d1d494 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix new file mode 100644 index 0000000000000..f00432b0c9ce4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix new file mode 100644 index 0000000000000..f67c19f42395a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages +}: + +kdeFramework { + name = "kdoctools"; + 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.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 0000000000000..4e3a33efab32b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix new file mode 100644 index 0000000000000..d165f84e3a2dd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch new file mode 100644 index 0000000000000..732f7b69c828d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch @@ -0,0 +1,13 @@ +Index: kfilemetadata-5.18.0/src/CMakeLists.txt +=================================================================== +--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt ++++ kfilemetadata-5.18.0/src/CMakeLists.txt +@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K + + install(EXPORT KF5FileMetaDataTargets + NAMESPACE KF5:: +- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData ++ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData + FILE KF5FileMetaDataTargets.cmake) + + install(FILES diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix new file mode 100644 index 0000000000000..9bb4831cf8da2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules +, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +}: + +kdeFramework { + name = "kfilemetadata"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series new file mode 100644 index 0000000000000..d2689425c3876 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series @@ -0,0 +1 @@ +cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix new file mode 100644 index 0000000000000..c535b3590a388 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix new file mode 100644 index 0000000000000..bc4e9ab11843a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix new file mode 100644 index 0000000000000..d40df466ebbdc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix new file mode 100644 index 0000000000000..268006512e7c3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, gettext +, python +, qtdeclarative +, qtscript +}: + +kdeFramework { + name = "ki18n"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative qtscript ]; + propagatedNativeBuildInputs = [ gettext python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch new file mode 100644 index 0000000000000..5b3b15d5d5b5b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch @@ -0,0 +1,13 @@ +Index: kiconthemes-5.17.0/src/kicontheme.cpp +=================================================================== +--- kiconthemes-5.17.0.orig/src/kicontheme.cpp ++++ kiconthemes-5.17.0/src/kicontheme.cpp +@@ -557,7 +557,7 @@ void KIconTheme::reconfigure() + // static + QString KIconTheme::defaultThemeName() + { +- return QStringLiteral("oxygen"); ++ return QStringLiteral("breeze"); + } + + void KIconTheme::assignIconsToContextMenu(ContextMenus type, diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix new file mode 100644 index 0000000000000..b78b25582bebd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper +, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg +}: + +kdeFramework { + name = "kiconthemes"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ breeze-icons ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series new file mode 100644 index 0000000000000..ab5cc8a3edb27 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series @@ -0,0 +1 @@ +default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix new file mode 100644 index 0000000000000..fc0865600239f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix new file mode 100644 index 0000000000000..49d66bbcc2c64 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch new file mode 100644 index 0000000000000..9c76079a382a8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +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.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix new file mode 100644 index 0000000000000..5f644d7c424e2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix new file mode 100644 index 0000000000000..a2131ff338505 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix @@ -0,0 +1,33 @@ +{ kdeFramework, lib, copyPathsToStore +, 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"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + 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.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch new file mode 100644 index 0000000000000..c9ad46b41bb76 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +Index: kio-5.17.0/src/core/ksambashare.cpp +=================================================================== +--- kio-5.17.0.orig/src/core/ksambashare.cpp ++++ kio-5.17.0/src/core/ksambashare.cpp +@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( + + bool KSambaSharePrivate::isSambaInstalled() + { +- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { +- return true; ++ const QByteArray pathEnv = qgetenv("PATH"); ++ if (!pathEnv.isEmpty()) { ++ QLatin1Char pathSep(':'); ++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/smbd"); ++ if (QFile::exists(*it)) { ++ return true; ++ } ++ } + } + +- //qDebug() << "Samba is not installed!"; +- + return false; + } + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series new file mode 100644 index 0000000000000..77ca154500474 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/series @@ -0,0 +1 @@ +samba-search-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix new file mode 100644 index 0000000000000..a9024d771cc33 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix new file mode 100644 index 0000000000000..931019ce495d7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix new file mode 100644 index 0000000000000..746edf12eea03 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix new file mode 100644 index 0000000000000..768720f178c87 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix new file mode 100644 index 0000000000000..22eef2d47bde6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix new file mode 100644 index 0000000000000..460458b22323a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix new file mode 100644 index 0000000000000..5bcd6f3014624 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix new file mode 100644 index 0000000000000..7e301dd0f2683 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix new file mode 100644 index 0000000000000..dd99d2d4f1e57 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch new file mode 100644 index 0000000000000..e9d7444481480 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch @@ -0,0 +1,13 @@ +Index: kpackage-5.18.0/src/kpackage/package.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/package.cpp ++++ kpackage-5.18.0/src/kpackage/package.cpp +@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix new file mode 100644 index 0000000000000..aea1b0d31a0d9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kdoctools +, ki18n +, makeQtWrapper +}: + +kdeFramework { + name = "kpackage"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ karchive kconfig ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postInstall = '' + wrapQtProgram "$out/bin/kpackagetool5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..ddbf17d00064c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch @@ -0,0 +1,26 @@ +Index: kpackage-5.18.0/src/kpackage/packageloader.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp ++++ kpackage-5.18.0/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li + } 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")) << QStringLiteral("metadata.json"); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series new file mode 100644 index 0000000000000..9b7f076efc70e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series @@ -0,0 +1,2 @@ +allow-external-paths.patch +qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix new file mode 100644 index 0000000000000..1c3e0b2cbc519 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice +, ktextwidgets, kwidgetsaddons, kxmlgui +}: + +kdeFramework { + name = "kparts"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons kiconthemes kjobwidgets knotifications + kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix new file mode 100644 index 0000000000000..4c3877e7efd2f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +, kitemviews, kservice, kwidgetsaddons, qtdeclarative +}: + +kdeFramework { + name = "kpeople"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kitemviews kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n qtdeclarative ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix new file mode 100644 index 0000000000000..c16f51b5ac3cd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kplotting"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix new file mode 100644 index 0000000000000..2e34e6f674cee --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: + +kdeFramework { + name = "kpty"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix new file mode 100644 index 0000000000000..7c6f079feaa7c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons +, kxmlgui, qtscript +}: + +kdeFramework { + name = "kross"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcompletion kcoreaddons kxmlgui ]; + propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix new file mode 100644 index 0000000000000..12d2b54d0eb36 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kservice, plasma-framework, qtquick1, solid +, threadweaver +}: + +kdeFramework { + name = "krunner"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons kservice qtquick1 solid threadweaver + ]; + propagatedBuildInputs = [ ki18n kio plasma-framework ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..3d8397d8ee2df --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +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.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 0000000000000..685c685261195 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +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.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix new file mode 100644 index 0000000000000..3a27d85b9166e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem +}: + +kdeFramework { + name = "kservice"; + propagatedNativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ kdoctools ]; + buildInputs = [ kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; + 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.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix new file mode 100644 index 0000000000000..b8df6a5f4c0d4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper, perl +, karchive, kconfig, kguiaddons, kiconthemes, kparts +, libgit2 +, qtscript, qtxmlpatterns +, ki18n, kio, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts + libgit2 + qtscript qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch new file mode 100644 index 0000000000000..19ab1e1e55138 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch @@ -0,0 +1,36 @@ +Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +=================================================================== +--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp ++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +@@ -55,19 +55,16 @@ QStringList readListing(const QString &f + + 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; + } +@@ -152,7 +149,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; + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series new file mode 100644 index 0000000000000..46cd23829a2fd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series @@ -0,0 +1 @@ +no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix new file mode 100644 index 0000000000000..e332d4ff9a832 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix new file mode 100644 index 0000000000000..3cf0f847d83d5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix new file mode 100644 index 0000000000000..5ade5f63a8d04 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets +, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes +, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, makeQtWrapper }: + +kdeFramework { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kconfig kconfigwidgets 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.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix new file mode 100644 index 0000000000000..d95f44d3fecfd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix new file mode 100644 index 0000000000000..09ab1f2200de3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix new file mode 100644 index 0000000000000..f081d5f9170e3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix new file mode 100644 index 0000000000000..20a300b68bc87 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix new file mode 100644 index 0000000000000..7d7f769d6a9be --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix new file mode 100644 index 0000000000000..333378bd14316 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix new file mode 100644 index 0000000000000..ee350f8e15367 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix new file mode 100644 index 0000000000000..d8846f7772318 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix new file mode 100644 index 0000000000000..afd125e3c5973 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix new file mode 100644 index 0000000000000..943fe04a1c92c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix new file mode 100644 index 0000000000000..b86c0b71224d6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz"; + sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv"; + name = "attica-5.19.0.tar.xz"; + }; + }; + baloo = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz"; + sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg"; + name = "baloo-5.19.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz"; + sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv"; + name = "bluez-qt-5.19.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz"; + sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0"; + name = "breeze-icons-5.19.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz"; + sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63"; + name = "extra-cmake-modules-5.19.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz"; + sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3"; + name = "frameworkintegration-5.19.0.tar.xz"; + }; + }; + kactivities = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz"; + sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3"; + name = "kactivities-5.19.0.tar.xz"; + }; + }; + kapidox = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz"; + sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz"; + name = "kapidox-5.19.0.tar.xz"; + }; + }; + karchive = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz"; + sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv"; + name = "karchive-5.19.0.tar.xz"; + }; + }; + kauth = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz"; + sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss"; + name = "kauth-5.19.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz"; + sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd"; + name = "kbookmarks-5.19.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz"; + sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8"; + name = "kcmutils-5.19.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz"; + sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66"; + name = "kcodecs-5.19.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz"; + sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd"; + name = "kcompletion-5.19.0.tar.xz"; + }; + }; + kconfig = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz"; + sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm"; + name = "kconfig-5.19.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz"; + sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv"; + name = "kconfigwidgets-5.19.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz"; + sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw"; + name = "kcoreaddons-5.19.0.tar.xz"; + }; + }; + kcrash = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz"; + sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl"; + name = "kcrash-5.19.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz"; + sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28"; + name = "kdbusaddons-5.19.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz"; + sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g"; + name = "kdeclarative-5.19.0.tar.xz"; + }; + }; + kded = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz"; + sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz"; + name = "kded-5.19.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz"; + sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn"; + name = "kdelibs4support-5.19.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz"; + sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5"; + name = "kdesignerplugin-5.19.0.tar.xz"; + }; + }; + kdesu = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz"; + sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz"; + name = "kdesu-5.19.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz"; + sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj"; + name = "kdewebkit-5.19.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz"; + sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314"; + name = "kdnssd-5.19.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz"; + sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn"; + name = "kdoctools-5.19.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz"; + sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5"; + name = "kemoticons-5.19.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz"; + sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr"; + name = "kfilemetadata-5.19.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz"; + sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d"; + name = "kglobalaccel-5.19.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz"; + sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy"; + name = "kguiaddons-5.19.0.tar.xz"; + }; + }; + khtml = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz"; + sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145"; + name = "khtml-5.19.0.tar.xz"; + }; + }; + ki18n = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz"; + sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05"; + name = "ki18n-5.19.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz"; + sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n"; + name = "kiconthemes-5.19.0.tar.xz"; + }; + }; + kidletime = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz"; + sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6"; + name = "kidletime-5.19.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz"; + sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5"; + name = "kimageformats-5.19.0.tar.xz"; + }; + }; + kinit = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz"; + sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm"; + name = "kinit-5.19.0.tar.xz"; + }; + }; + kio = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz"; + sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv"; + name = "kio-5.19.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz"; + sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7"; + name = "kitemmodels-5.19.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz"; + sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn"; + name = "kitemviews-5.19.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz"; + sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji"; + name = "kjobwidgets-5.19.0.tar.xz"; + }; + }; + kjs = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz"; + sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf"; + name = "kjs-5.19.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz"; + sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48"; + name = "kjsembed-5.19.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz"; + sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay"; + name = "kmediaplayer-5.19.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz"; + sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4"; + name = "knewstuff-5.19.0.tar.xz"; + }; + }; + knotifications = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz"; + sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av"; + name = "knotifications-5.19.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz"; + sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj"; + name = "knotifyconfig-5.19.0.tar.xz"; + }; + }; + kpackage = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz"; + sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv"; + name = "kpackage-5.19.0.tar.xz"; + }; + }; + kparts = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz"; + sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l"; + name = "kparts-5.19.0.tar.xz"; + }; + }; + kpeople = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz"; + sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98"; + name = "kpeople-5.19.0.tar.xz"; + }; + }; + kplotting = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz"; + sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq"; + name = "kplotting-5.19.0.tar.xz"; + }; + }; + kpty = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz"; + sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03"; + name = "kpty-5.19.0.tar.xz"; + }; + }; + kross = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz"; + sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p"; + name = "kross-5.19.0.tar.xz"; + }; + }; + krunner = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz"; + sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx"; + name = "krunner-5.19.0.tar.xz"; + }; + }; + kservice = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz"; + sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm"; + name = "kservice-5.19.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz"; + sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp"; + name = "ktexteditor-5.19.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz"; + sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp"; + name = "ktextwidgets-5.19.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz"; + sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb"; + name = "kunitconversion-5.19.0.tar.xz"; + }; + }; + kwallet = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz"; + sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm"; + name = "kwallet-5.19.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz"; + sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm"; + name = "kwidgetsaddons-5.19.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz"; + sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch"; + name = "kwindowsystem-5.19.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz"; + sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah"; + name = "kxmlgui-5.19.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz"; + sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g"; + name = "kxmlrpcclient-5.19.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz"; + sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w"; + name = "modemmanager-qt-5.19.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz"; + sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13"; + name = "networkmanager-qt-5.19.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz"; + sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0"; + name = "oxygen-icons5-5.19.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz"; + sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497"; + name = "plasma-framework-5.19.0.tar.xz"; + }; + }; + solid = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz"; + sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz"; + name = "solid-5.19.0.tar.xz"; + }; + }; + sonnet = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz"; + sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7"; + name = "sonnet-5.19.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz"; + sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw"; + name = "threadweaver-5.19.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix new file mode 100644 index 0000000000000..52817921cc723 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/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/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index f4ea47e633f9e..b324494faff74 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { patches = [ ./gcc-4.9.patch ]; + outputs = [ "out" "lib" "doc" ]; # a small single header + outputMan = "out"; + nativeBuildInputs = [ ] ++ optional nasmSupport nasm; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index c98a01f6f70f1..9365cf0b5f091 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; + outputs = [ "dev" "out" "bin" "man" ]; + meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index db82c943d7c2b..7dea029491aa7 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libtiff, libjpeg, zlib}: +{ stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { name = "lcms2-2.7"; @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; + outputs = [ "dev" "out" "bin" ]; + propagatedBuildInputs = [ libtiff libjpeg zlib ]; - meta = { + meta = with stdenv.lib; { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + license = licenses.mit; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix new file mode 100644 index 0000000000000..60205d7a856b7 --- /dev/null +++ b/pkgs/development/libraries/leatherman/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, boost, cmake, curl }: + +stdenv.mkDerivation rec { + name = "leatherman-${version}"; + version = "0.4.2"; + + src = fetchFromGitHub { + sha256 = "07bgv99lzzhxy4l7mdyassxqy33zv7arvfw63bymsqavppphqlrr"; + rev = version; + repo = "leatherman"; + owner = "puppetlabs"; + }; + + buildInputs = [ boost cmake curl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/puppetlabs/leatherman/; + description = "A collection of C++ and CMake utility libraries"; + license = licenses.asl20; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index c0a6d4b6b1f12..776cd0f5b91ff 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; }; + outputs = [ "dev" "out" "doc" ]; + buildInputs = [ pkgconfig ] ++ lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index ff33043dbaeac..467dd87f43e94 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { preFixup = '' sed -i $out/lib/libarchive.la \ - -e 's|-lcrypto|-L${openssl}/lib -lcrypto|' \ + -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index a9c83594179f3..f2f31963d6701 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; }; + outputs = [ "dev" "out" "info" ]; + outputBin = "dev"; # libassuan-config + buildInputs = [ libgpgerror pth ]; doCheck = true; # Make sure includes are fixed for callers who don't use libassuan-config postInstall = '' - sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/assuan.h + sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; meta = { diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 4d5563adab022..b84b852691fd6 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -7,10 +7,10 @@ , x264Support ? false, x264 ? null , xvidSupport ? true, xvidcore ? null , faacSupport ? false, faac ? null -, vaapiSupport ? false, libva ? null # ToDo: it has huge closure +, vaapiSupport ? true, libva ? null , vdpauSupport ? true, libvdpau ? null , freetypeSupport ? true, freetype ? null # it's small and almost everywhere -, SDL # only for avplay in $tools, adds nontrivial closure to it +, SDL # only for avplay in $bin, adds nontrivial closure to it , enableGPL ? true # ToDo: some additional default stuff may need GPL , enableUnfree ? faacSupport }: @@ -81,20 +81,18 @@ let enableParallelBuilding = true; - outputs = [ "out" "tools" ]; + outputs = [ "dev" "out" "bin" ]; + setOutputFlags = false; # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. buildFlags = "all alltools install-man"; postInstall = '' - # move avplay to get rid of the SDL dependency in the main output - mkdir -p "$tools/bin" - mv "$out/bin/avplay" "$tools/bin" - + moveToOutput bin "$bin" # alltools target compiles an executable in tools/ for every C # source file in tools/, so move those to $out for tool in $(find tools -type f -executable); do - mv "$tool" "$out/bin/" + mv "$tool" "$bin/bin/" done ''; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index c3059642382a9..7a905d9c82a64 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; }; + outputs = [ "dev" "bin" "out" "man" ]; + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; propagatedBuildInputs = [ ncurses zlib ]; + postInstall = '' + mkdir -p $dev/bin + mv $bin/bin/caca-config $dev/bin/caca-config + ''; + meta = { homepage = http://libcaca.zoy.org/; description = "A graphics library that outputs text instead of pixels"; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index b441719d31cd0..8e3523a27e9fd 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/lib/*.la; do - sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f + sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $f done ''; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index e8debfda1de5c..008311c620c9a 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -15,11 +15,12 @@ stdenv.mkDerivation rec { enableParallelBuild = true; - configurePhase = '' - sed -i -e 's|/bin/pwd|pwd|g' configure - ./configure -config release -prefix $out -qmake ${qt5.qtbase}/bin/qmake + postPatch = '' + sed -i -e 's|/bin/pwd|pwd|g' -e 's/which/type -P/' configure ''; + configureFlags = [ "-config release" ]; + meta = with stdenv.lib; { description = "A cross-platform IRC framework written with Qt"; homepage = https://communi.github.io; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index ccc0a19965499..f64174778b205 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ] ++ optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" - "--with-pgsql_libdir=${postgresql}/lib" + "--with-pgsql_libdir=${postgresql.lib}/lib" ] ++ optionals (sqlite != null) [ "--with-sqlite3" - "--with-sqlite3-incdir=${sqlite}/include/sqlite" - "--with-sqlite3-libdir=${sqlite}/lib/sqlite" + "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" + "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" ]; installFlags = [ "DESTDIR=\${out}" ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 154277f9cc66e..ad524ffeb0278 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess ] ++ stdenv.lib.optional stdenv.isLinux udev; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index d68b0a3675178..c5cdec0ae5ff8 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libdvdcss-${version}"; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.videolan.org/developers/libdvdcss.html; description = "A library for decrypting DVDs"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 6e8d85cb88d92..7868c2cfd140f 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ - -e 's,-lncurses[a-z]*,-L${ncurses}/lib -lncursesw,g' + -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 309f17b814297..515e0c32ee1ca 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gettext, glibc }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "libelf-0.8.13"; src = fetchurl { @@ -18,6 +18,11 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ glibc ]; }; + # Libelf's custom NLS macros fail to determine the catalog file extension on + # Darwin, so disable NLS for now. + # FIXME: Eventually make Gettext a build input on all platforms. + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls"; + buildInputs = [ gettext ]; meta = { @@ -31,12 +36,3 @@ stdenv.mkDerivation (rec { maintainers = [ ]; }; } - -// - -# Libelf's custom NLS macros fail to determine the catalog file extension on -# Darwin, so disable NLS for now. -# FIXME: Eventually make Gettext a build input on all platforms. -(if stdenv.isDarwin - then { configureFlags = [ "--disable-nls" ]; } - else { })) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index bddda9f3eadd2..b0b537ddb175f 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation { url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz"; sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; }; + postPatch = "patchShebangs event_rpcgen.py"; + + outputs = [ "dev" "out" ]; + outputBin = "dev"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; - patchPhase = '' - patchShebangs event_rpcgen.py - ''; - meta = with stdenv.lib; { description = "Event notification library"; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 18387c904f83e..2b6571290dfb9 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " - + "--with-ltdl-lib=${libtool}/lib " + + "--with-ltdl-lib=${libtool.lib}/lib " + "--enable-xpdf"; # Checks need to be run after "make install", otherwise plug-ins are not in diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 5c981e664cb44..962f716c120a7 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"; }; - patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null; + patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch; + + outputs = [ "dev" "out" "doc" ]; buildInputs = stdenv.lib.optional doCheck dejagnu; @@ -21,9 +23,13 @@ stdenv.mkDerivation rec { dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. - # Install headers in the right place. - postInstall = '' - ln -s${if (stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) then "" else "r"}v "$out/lib/"libffi*/include "$out/include" + # Install headers and libs in the right places. + postFixup = '' + mkdir -p "$dev/" + mv "$out/lib/${name}/include" "$dev/include" + rmdir "$out/lib/${name}" + substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \ + --replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index efa9b90e869f5..db17b46b0d354 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -3,11 +3,15 @@ let inherit (stdenv.lib) optional; in -stdenv.mkDerivation { - name = if extraOnly then "libfm-extra-1.2.3" else "libfm-1.2.3"; +stdenv.mkDerivation rec { + name = if extraOnly + then "libfm-extra-${version}" + else "libfm-${version}"; + version = "1.2.4"; + src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-1.2.3.tar.xz"; - sha256 = "1ygvw52262r3jp1f45m9cdpx5xgvd4rkyfszslfqvg2c99ig34n6"; + url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; + sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; }; buildInputs = [ glib gtk intltool pango pkgconfig vala ] diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 990e73d0a63ee..d77946e5ec37a 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' - sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h + sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 835d6f0f5c29e..d566a0e8567be 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -3,23 +3,27 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { - name = "libgcrypt-1.6.5"; + name = "libgcrypt-${version}"; + version = "1.7.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl"; + sha256 = "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh"; }; + outputs = [ "dev" "out" "info" ]; + outputBin = "dev"; + buildInputs = [ libgpgerror ] ++ lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config - postInstall = '' - sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h + postFixup = '' + sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 26214bd8801be..9c4f3705b3ed0 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; + outputs = [ "dev" "out" "info" ]; + outputBin = "dev"; # deps want just the lib, most likely + # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. crossAttrs.buildInputs = [ gettext ]; @@ -25,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; description = "A small library that defines common error values for all GnuPG components"; @@ -36,9 +39,9 @@ stdenv.mkDerivation rec { Daemon and possibly more in the future. ''; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.lgpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index a8511006d0417..6912c02260dc1 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0chz57rhzdz1cbdjw1q5rs439s879kk06jrci4jyn5rlm7iyic6d"; + sha256 = "1wjf79ipqwb5phfjjwf15rwgigakylnfqaj4crs5qnds6ba6i1ld"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.9"; + version = "2.5.10"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index b7e774b52235b..25d1ceb40bdb8 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,11 +4,11 @@ with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.34"; + name = "libgsf-1.14.36"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "f0fea447e0374a73df45b498fd1701393f8e6acb39746119f8a292fb4a0cb528"; + sha256 = "0h19ssxzz0cmznwga2xy55kjibm24mwxqarnpd0w7xy0hrzm1dvi"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 2e3307b54bf5b..8901fef21fd02 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-appliance --disable-daemon"; patches = [ ./libguestfs-syms.patch ]; - NIX_CFLAGS_COMPILE="-I${libxml2}/include/libxml2/"; + NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; postInstall = '' for bin in $out/bin/*; do diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 713e1d39954c9..e49a85942d76c 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds"; }; + outputs = [ "dev" "out" "bin" "info" "docdev" ]; + doCheck = ! stdenv.isDarwin; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 6d80bfdccf1ff..18dbd2de38bfa 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.1"; + name = "libinput-1.2.2"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2"; + sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08"; }; configureFlags = [ @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libevdev mtdev udev libwacom ] + buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; + propagatedBuildInputs = [ udev ]; + meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 3660a652e79dc..79cf45a8005f5 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchurl, nasm, autoreconfHook }: stdenv.mkDerivation rec { name = "libjpeg-turbo-1.4.2"; @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj"; }; - buildInputs = [ nasm ]; + outputs = [ "dev" "out" "doc" "bin" ]; + + buildInputs = [ autoreconfHook nasm ]; + + enableParallelBuilding = true; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index bf2ebb27f37f8..025be2009599b 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { configureFlags = optional static "--enable-static --disable-shared"; + outputs = [ "dev" "out" "man" "bin" ]; + meta = { homepage = http://www.ijg.org/; description = "A library that implements the JPEG image file format"; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 9ea4748af4b30..729df918e5798 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure qmake + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index f910741c446e4..8baf4a77c362e 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; }; + outputs = [ "dev" "out" "doc" ]; + preConfigure = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 3ef4ba77c31c8..c681879453347 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07j1p21rvbrrfpxngk8xswzkmjkh94bp1971xfjh1p0ja709qwzj"; }; - outputs = [ "out" "info" ]; + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ libgcrypt ]; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 234f56863c099..b97ee6a4ced0b 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317"; }; + outputs = [ "dev" "out" "docdev" ]; + outputMan= "docdev"; + propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ]; - meta = { + meta = with stdenv.lib; { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; - license = stdenv.lib.licenses.zlib; - maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; - hydraPlatforms = stdenv.lib.platforms.linux; + license = licenses.zlib; + maintainers = with maintainers; [ marcweber urkud ]; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 95e8dd9af48fa..0d3c9c0997c13 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr ]; - CFLAGS = "-I${gmp}/include"; + CFLAGS = "-I${gmp.dev}/include"; doCheck = true; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 13b4050193367..671169b9ab3a9 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -3,17 +3,19 @@ stdenv.mkDerivation rec { name = "libmtp-1.1.9"; - propagatedBuildInputs = [ libusb1 ]; - buildInputs = [ pkgconfig ]; - - # tried to install files to /lib/udev, hopefully OK - configureFlags = [ "--with-udev=$$out/lib/udev" ]; - src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93"; }; + outputs = [ "dev" "bin" "out" ]; + + propagatedBuildInputs = [ libusb1 ]; + buildInputs = [ pkgconfig ]; + + # tried to install files to /lib/udev, hopefully OK + configureFlags = [ "--with-udev=$$bin/lib/udev" ]; + meta = { homepage = http://libmtp.sourceforge.net; description = "An implementation of Microsoft's Media Transfer Protocol"; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 479a187cf87c9..f62fb400199f0 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/liboauth.la \ - --replace "-lnss3" "-L${nss}/lib -lnss3" + --replace "-lnss3" "-L${nss.out}/lib -lnss3" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 407e218065bb2..1aa4b8ad04532 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "doc" ]; meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 43b1f34709347..754e308ac15ba 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -8,10 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; }; - buildInputs = [ pkgconfig ]; - patches = [ ./x86_64-cpuid.patch ]; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; # oil-bugreport + + nativeBuildInputs = [ pkgconfig ]; + # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 460aaa2b0eca0..b8951e66c8bdb 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr"; }; + outputs = [ "dev" "out" ]; + configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point" ++ stdenv.lib.optional withCustomModes "--enable-custom-modes"; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix new file mode 100644 index 0000000000000..bda5143208ec9 --- /dev/null +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, glib, db, pkgconfig }: + +stdenv.mkDerivation { + name = "libpinyin-1.3.0"; + + meta = with stdenv.lib; { + description = "Library for intelligent sentence-based Chinese pinyin input method"; + homepage = https://sourceforge.net/projects/libpinyin; + license = licenses.gpl2; + platforms = platforms.linux; + }; + + buildInputs = [ glib db pkgconfig ]; + + src = fetchurl { + url = "mirror://sourceforge/project/libpinyin/libpinyin/libpinyin-1.3.0.tar.gz"; + sha256 = "e105c443b01cd67b9db2a5236435d5441cf514b997b891215fa65f16030cf1f2"; + }; +} diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 7ae3d0e1d6827..01e90cb191324 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0zkra0b9lrpk2axassdgkqinmc2ba6b473sm52xbpyknaqs2fljy"; }; + outputs = [ "dev" "out" "man" ]; + propagatedBuildInputs = [ zlib ]; passthru = { inherit zlib; }; @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-static"; + postInstall = ''mv "$out/bin" "$dev/bin"''; + meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 4e18dcb680f93..6faed97aaee28 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -18,13 +18,18 @@ in stdenv.mkDerivation rec { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; inherit sha256; }; - postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; + outputs = [ "dev" "out" "man" ]; + propagatedBuildInputs = [ zlib ]; + preConfigure = "export bin=$dev"; + doCheck = true; + postInstall = ''mv "$out/bin" "$dev/bin"''; + passthru = { inherit zlib; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 7085236feb52c..0f08085063983 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation rec { sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; }; + outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs + nativeBuildInputs = [ pkgconfig cmake ]; propagatedBuildInputs = [ zlib ] # now some optional deps, but many more are possible diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a620826576cc1..07258e40355dd 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-04-05"; + listVersion = "2016-04-16"; listSources = fetchFromGitHub { - sha256 = "08ai0yyym0mvsn92fasfn5b5rdrjbavxxl1hhp60g1m0iamfzpa4"; - rev = "1e0c6b000874f98f28663870909e32ee6323fe1d"; + sha256 = "0lwf8cvqfr3nsx92i2fphij0whb2lcswk6z6grhisqmwrs873hyv"; + rev = "dfac82546fde5180e2d5a1b61b6ae2f668009870"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 9699d67d7b87a..82768cd350dd9 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; + outputs = [ "dev" "out" "docdev" ]; + preBuild = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 3d564fc00f8be..031886d345168 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; }; - buildInputs = [ lcms2 jasper ] ; + buildInputs = [ lcms2 jasper ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix index a3389a49fbc87..09505217ae2db 100644 --- a/pkgs/development/libraries/libressl/2.2.nix +++ b/pkgs/development/libraries/libressl/2.2.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "dev" "out" "man" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index 962bb5472636c..129456e6657c8 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "dev" "out" "man" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ea1910733e7d2..0768a21bf5436 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; NIX_CFLAGS_COMPILE - = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo"; + = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Merge gdkpixbuf and librsvg loaders postInstall = '' mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache + cat ${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache rm $GDK_PIXBUF/loaders.cache.tmp ''; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 481d82c0c9ad3..f0ff549c71686 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, pkgconfig -, fftw, libsndfile -}: +{ stdenv, fetchurl, pkgconfig, libsndfile }: stdenv.mkDerivation rec { name = "libsamplerate-0.1.8"; @@ -11,12 +9,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fftw libsndfile ]; + buildInputs = [ libsndfile ]; # maybe interesting configure flags: #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper + outputs = [ "dev" "bin" "out" ]; + postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' # need headers from the Carbon.framework in /System/Library/Frameworks to diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 48a2999e7af9d..547c7647b7a8d 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -3,16 +3,20 @@ }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.25"; + name = "libsndfile-1.0.26"; src = fetchurl { url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; + sha256 = "14jhla289cj45946h0hq2an0a9g4wkwb3v4571bla6ixfvn20rfd"; }; buildInputs = [ pkgconfig flac libogg libvorbis ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; + enableParallelBuilding = true; + + outputs = [ "dev" "out" "bin" "doc" ]; + # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle preConfigure = stdenv.lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 660ea28091230..e8b3bc1cebc9b 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.8"; + name = "libsodium-1.0.10"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0"; + sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp"; + outputs = [ "dev" "out" ]; + + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 3d10e6135055c..aa84c507c97a3 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -18,11 +18,13 @@ stdenv.mkDerivation { patchShebangs libsoup/ ''; + outputs = [ "dev" "out" ]; + buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; - passthru.propagatedUserEnvPackages = [ glib_networking ]; + passthru.propagatedUserEnvPackages = [ glib_networking.out ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 17538a6c3803a..adfd11d9b197c 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; + outputs = [ "dev" "out" ]; + buildInputs = [ zlib openssl libsodium ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 3268178433516..855e57c0550ae 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4"; }; + outputs = [ "dev" "out" "docdev" ]; + buildInputs = [ openssl zlib ]; crossAttrs = { diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 1ae26c48fc21a..5ac8cc94d044b 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + buildInputs = [ perl texinfo ]; doCheck = true; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index da590adae0623..129dface2d938 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + outputs = [ "dev" "out" "docdev" ]; + outputDoc = "docdev"; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg libvorbis ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2c559d221abe9..a506279c2a4af 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; }; - outputs = [ "out" "doc" "man" ]; + outputs = [ "dev" "out" "bin" "doc" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index 9702fbd02da30..eff8e2449a13a 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" + "--with-libsodium-headers=${libsodium.dev}/include" + "--with-libsodium-libs=${libsodium.out}/lib" "--enable-ntox" "--enable-daemon" ]; diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix index 471fafdad38b0..2fb5e93eab954 100644 --- a/pkgs/development/libraries/libtoxcore/old-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" + "--with-libsodium-headers=${libsodium.dev}/include" + "--with-libsodium-libs=${libsodium.out}/lib" "--enable-ntox" "--enable-daemon" ]; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 86428e08c4754..4b81152a43291 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libuchardet-${version}"; - version = "0.0.1"; + version = "0.0.5"; src = fetchFromGitHub { owner = "BYVoid"; repo = "uchardet"; - rev = "69b7133995e4ee260b093323c57a7f8c6c6803b8"; - sha256 = "0yqrc9a7wxsh2fvigjppjp55v4r1q8p40yh048xsvl3kly2rkqy9"; + rev = "v${version}"; + sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 86f0c50dd207f..7eea905f64af4 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure ''; + outputs = [ "dev" "out" ]; + propagatedBuildInputs = [ xz ]; preInstall = '' @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' find $out -name \*.la | while read file; do - sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file + sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file done ''; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 7aec64d596fc8..b1872779b707f 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -3,6 +3,9 @@ stdenv.mkDerivation { name = "libusb-compat-0.1.5"; + outputs = [ "dev" "out" ]; # get rid of propagating systemd closure + outputBin = "dev"; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 75d6bdb4cc6a8..fe920bba411fd 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }: +{ stdenv, fetchurl, pkgconfig, libudev ? null, libobjc, IOKit }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -8,15 +8,17 @@ stdenv.mkDerivation rec { sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; }; + outputs = [ "dev" "out" ]; # get rid of propagating systemd closure + buildInputs = [ pkgconfig ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux udev ++ + stdenv.lib.optional stdenv.isLinux libudev ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la + sed 's,-ludev,-L${libudev.out}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = { diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 557d0f591553c..9e22aa1d37cf6 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, mesa_noglu ? null +, mesa_noglu +, minimal ? true, libva }: -let - withMesa = mesa_noglu != null; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libva-1.6.2"; src = fetchurl { @@ -12,9 +11,15 @@ in stdenv.mkDerivation rec { sha256 = "1l4bij21shqbfllbxicmqgmay4v509v9hpxyyia9wm7gvsfg05y4"; }; - buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa_noglu ]; + outputs = [ "dev" "out" "bin" ]; - configureFlags = lib.optionals withMesa [ + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + configureFlags = lib.optionals (!minimal) [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" "--enable-glx" ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 446f2917fe710..3337a89dd1cec 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; + outputs = [ "dev" "out" ]; + buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 343f3b757e33a..1d1945af31944 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper , libxml2, gnutls, devicemapper, perl, python -, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext +, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, xen @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "01fg9jbifndwc3jzzizsisvz98q325xarczgf6rn11hphckgrip3"; + sha256 = "13w56fhspf7ygr3v0jhh44g25xbcx5vmrprzcy9cajsppa6knq4r"; }; patches = [ ./build-on-bsd.patch ]; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ stdenv.lib.optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux udev libcap_ng + libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng libnl numad numactl xen ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv gmp ]; preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/bin:$PATH substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' '' + '' PATH=${dnsmasq}/bin:$PATH diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 68f1fe7208569..0022799c88fe4 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "doc" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg ]; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 6a47566707860..5c593dd1f75ee 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; + outputs = [ "dev" "out" "bin" ]; + setOutputFlags = false; + configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -146,6 +149,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = ''moveToOutput bin "$bin" ''; + crossAttrs = let isCygwin = stdenv.cross.libc == "msvcrt"; isDarwin = stdenv.cross.libc == "libSystem"; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 31b1c197e9ff0..064fb807a214e 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -73,6 +73,9 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; + outputs = [ "dev" "out" "bin" ]; + setOutputFlags = false; + configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -147,6 +150,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = ''moveToOutput bin "$bin" ''; + crossAttrs = let isCygwin = stdenv.cross.libc == "msvcrt"; isDarwin = stdenv.cross.libc == "libSystem"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 6c6c0812c43c3..a763af96667b8 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation { sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + patches = [ ./install_introspection_to_prefix.patch ]; buildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 6a4479bdda38c..bb5258120494d 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index ea74bea152c2e..2bf7bbaabb319 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"; }; + outputs = [ "dev" "out" ]; + buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; configureFlags = '' diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index d69276a070bba..f074b31bb6820 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; }; + outputs = [ "dev" "out" "docdev" ]; + # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index cac8f10d37aa3..f7e175373e120 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,10 +1,6 @@ -{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }: +{ stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }: -assert pythonSupport -> python != null; - -#TODO: share most stuff between python and non-python builds, perhaps via multiple-output - -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.3"; @@ -13,9 +9,10 @@ stdenv.mkDerivation (rec { sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "bin" "doc" "py" ]; + propagatedBuildOutputs = "out bin py"; - buildInputs = stdenv.lib.optional pythonSupport python + buildInputs = [ python ] # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -23,10 +20,21 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ zlib findXMLCatalogs ]; - passthru = { inherit pythonSupport version; }; + configureFlags = "--with-python=${python}"; enableParallelBuilding = true; + preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; + installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + + postFixup = '' + moveToOutput bin/xml2-config "$dev" + moveToOutput lib/xml2Conf.sh "$dev" + moveToOutput share/man/man1 "$bin" + ''; + + passthru = { inherit version; pythonSupport = true; }; + meta = { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; @@ -34,14 +42,4 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; - -} // stdenv.lib.optionalAttrs pythonSupport { - configureFlags = "--with-python=${python}"; - - # this is a pair of ugly hacks to make python stuff install into the right place - preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; - installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; - -} // stdenv.lib.optionalAttrs (!pythonSupport) { - configureFlags = "--with-python=no"; # otherwise build impurity bites us -}) +} diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 9aa70ea047169..0eda42879ece8 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,13 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "bin" "doc" ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ findXMLCatalogs ]; configureFlags = [ - "--with-libxml-prefix=${libxml2}" "--without-python" "--without-crypto" "--without-debug" @@ -32,11 +31,17 @@ stdenv.mkDerivation rec { "--without-debugger" ]; - meta = { + postFixup = '' + moveToOutput bin/xslt-config "$dev" + moveToOutput lib/xsltConf.sh "$dev" + moveToOutput share/man/man1 "$bin" + ''; + + meta = with stdenv.lib; { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = "bsd"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.unix; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index de82bd0243e9e..4259e52510bc9 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace "tidy/tidy.h" "tidy.h" \ --replace "/usr/include/tidy" "${libtidy}/include" \ - --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" + --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h ''; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1c2257998e863..ad6bf8ba31902 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll -, python, libxml2Python, file, expat, makedepend, pythonPackages -, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll +, file, expat, libdrm, xorg, wayland, libudev, llvmPackages, libffi, libomxil-bellagio , libvdpau, libelf, libva , grsecEnabled , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt @@ -21,12 +20,13 @@ else - libOSMesa is in $osmesa (~4 MB) */ +with { inherit (stdenv.lib) optional optionalString; }; + let version = "11.1.2"; # this is the default search path for DRI drivers - driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; + driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in -with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation { name = "mesa-noglu-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation { ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; - inherit udev; + libudev = libudev.out; }); postPatch = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation { --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"' ''; - outputs = ["out" "drivers" "osmesa"]; + outputs = [ "dev" "out" "drivers" "osmesa" ]; configureFlags = [ "--sysconfdir=/etc" @@ -103,17 +103,17 @@ stdenv.mkDerivation { ] ++ optional enableTextureFloats "--enable-texture-float" ++ optional grsecEnabled "--enable-glx-rts"; # slight performance degradation, enable only for grsec - nativeBuildInputs = [ pkgconfig python makedepend file flex bison pythonPackages.Mako ]; + nativeBuildInputs = [ pkgconfig file ]; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] - ++ optionals stdenv.isLinux [ libdrm ]; + ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - autoreconfHook intltool expat libxml2Python llvmPackages.llvm + autoreconfHook intltool expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */ - ] ++ optional stdenv.isLinux udev; + ] ++ optional stdenv.isLinux libudev; enableParallelBuilding = true; doCheck = false; @@ -133,41 +133,42 @@ stdenv.mkDerivation { $out/lib/vdpau \ $out/lib/libxatracker* - mkdir -p {$osmesa,$drivers}/lib/pkgconfig + mkdir -p {$osmesa,$drivers}/lib/ mv -t $osmesa/lib/ \ $out/lib/libOSMesa* - mv -t $drivers/lib/pkgconfig/ \ - $out/lib/pkgconfig/xatracker.pc - - mv -t $osmesa/lib/pkgconfig/ \ - $out/lib/pkgconfig/osmesa.pc - '' + /* now fix references in .la files */ '' sed "/^libdir=/s,$out,$osmesa," -i \ $osmesa/lib/libOSMesa*.la - '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ '' - find $drivers/ $osmesa/ -type f -executable -print0 | xargs -0 strip -S || true + '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" + '' + /* move vdpau drivers to $drivers/lib, so they are found */ '' + mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau + ''; + #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */ - '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ '' + postFixup = + # add RPATH so the drivers can find the moved libgallium and libdricore9 + # moved here to avoid problems with stripping patchelfed files + '' for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do if [[ ! -L "$lib" ]]; then patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done - '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' - substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" ''; - #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM + # ToDo + /* check $out doesn't depend on llvm */ '' + # builder failures are ignored for some reason + # grep -qv '${llvmPackages.llvm}' -R "$out" passthru = { inherit libdrm version driverLink; }; - meta = { + meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; - license = "bsd"; - platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; + license = licenses.mit; # X11 variant, in most files + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff index a4bb6a72b1381..9a52265722391 100644 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff @@ -16,7 +16,7 @@ index 4fdf3c2..69ea22d 100644 do { for (version = 1; version >= 0; version--) { - snprintf(name, sizeof(name), "libudev.so.%d", version); -+ snprintf(name, sizeof(name), "@udev@/lib/libudev.so.%d", version); ++ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version); udev_handle = dlopen(name, flags); if (udev_handle) return udev_handle; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index c63dc2c3dee9b..882e0ec4faaf7 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./upstream.patch ]; + outputs = [ "dev" "out" "doc" ]; + # mpfr.h requires gmp.h propagatedBuildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 2fa62ced2d5b4..6e4b3e6a862a3 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,9 +1,12 @@ -{stdenv, fetchFromGitHub, libX11, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}: +{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, + boost, pkgconfig, withOgre ? false, ogre ? null, mesa ? null } : -stdenv.mkDerivation rec { +let + renderSystem = if withOgre then "3" else "4"; +in stdenv.mkDerivation rec { name = "mygui-${version}"; version = "3.2.2"; - + src = fetchFromGitHub { owner = "MyGUI"; repo = "mygui"; @@ -13,11 +16,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ libX11 unzip ogre cmake ois freetype libuuid boost pkgconfig ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost pkgconfig (if withOgre then ogre else mesa) ]; + + # Tools are disabled due to compilation failures. + cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; - meta = { + meta = with stdenv.lib; { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = stdenv.lib.licenses.lgpl3Plus; + license = licenses.lgpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 8817e2c5523ba..edd2636059609 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { # gcc-5.patch should be removed after 5.9 patches = [ ./clang.patch ./gcc-5.patch ]; + outputs = [ "dev" "out" "man" ]; + setOutputFlags = false; # some aren't supported + configureFlags = [ "--with-shared" "--without-debug" @@ -33,9 +36,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' - configureFlagsArray+=("--includedir=$out/include") - export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" + export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + configureFlagsArray+=( + "--libdir=$out/lib" + "--includedir=$dev/include" + "--bindir=$dev/bin" + "--mandir=$man/share/man" + "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" + ) '' + lib.optionalString stdenv.isSunOS '' sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ @@ -55,44 +64,52 @@ stdenv.mkDerivation rec { # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the # wide-character libraries (e.g. libncurses.so to libncursesw.so). - postInstall = '' + postFixup = '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" - libs="$(ls $out/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")" + libs="$(ls $dev/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")" suffixes="$(echo "$suffix" | awk '{for (i=1; i < length($0); i++) {x=substr($0, i+1, length($0)-i); print x}}')" # Get the path to the config util - cfg=$(basename $out/bin/ncurses*-config) + cfg=$(basename $dev/bin/ncurses*-config) # symlink the full suffixed include directory - ln -svf . $out/include/ncurses$suffix + ln -svf . $dev/include/ncurses$suffix for newsuffix in $suffixes ""; do # Create a non-abi versioned config util links - ln -svf $cfg $out/bin/ncurses$newsuffix-config + ln -svf $cfg $dev/bin/ncurses$newsuffix-config # Allow for end users who #include <ncurses?w/*.h> - ln -svf . $out/include/ncurses$newsuffix + ln -svf . $dev/include/ncurses$newsuffix - for lib in $libs; do + for library in $libs; do for dylibtype in so dll dylib; do - if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then - ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype - ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion} + if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then + ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype + ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion} fi done for statictype in a dll.a la; do - if [ -e "$out/lib/lib''${lib}$suffix.$statictype" ]; then - ln -svf lib''${lib}$suffix.$statictype $out/lib/lib$lib$newsuffix.$statictype + if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then + ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype fi done - ln -svf ''${lib}$suffix.pc $out/lib/pkgconfig/$lib$newsuffix.pc + ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc done done + + # move some utilities to $bin + # these programs are used at runtime and don't really belong in $dev + moveToOutput "bin/clear" "$out" + moveToOutput "bin/reset" "$out" + moveToOutput "bin/tabs" "$out" + moveToOutput "bin/tput" "$out" + moveToOutput "bin/tset" "$out" ''; preFixup = '' - rm $out/lib/*.a + rm "$out"/lib/*.a ''; meta = { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 3c439eb404cc3..1bfb739712f40 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation (rec { inherit src; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + buildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; @@ -61,5 +64,5 @@ stdenv.lib.optionalAttrs stdenv.isSunOS { # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> # for details. - configureFlags = [ "--with-include-path=${gmp}/include" ]; + configureFlags = [ "--with-include-path=${gmp.dev}/include" ]; }) diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index f5f72c006c73e..8a4b793cad797 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -14,16 +14,18 @@ stdenv.mkDerivation rec { buildInputs = [ slang popt ]; + NIX_LDFLAGS = "-lncurses"; + crossAttrs = { makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; }; - meta = { + meta = with stdenv.lib; { homepage = https://fedorahosted.org/newt/; description = "Library for color text mode, widget based user interfaces"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.viric ]; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = [ maintainers.viric ]; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index e6f76ce27ea71..761f6933f5c4a 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { - url = "http://http.debian.net/debian/pool/main/n/nghttp2/nghttp2_${version}.orig.tar.bz2"; + url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; sha256 = "10xz3s624w208pr9xgm4ammc8bc5mi17vy4357hjfd5vmmp5m8b0"; }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 230c22258e2ec..726b5d7b29afe 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation { sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + preConfigure = '' cd nspr ''; @@ -21,6 +24,7 @@ stdenv.mkDerivation { postInstall = '' find $out -name "*.a" -delete + moveToOutput share "$dev" # just aclocal ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e8be72999527f..fc5bffe6b7408 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite -, includeTools ? false -}: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite }: let @@ -46,15 +44,18 @@ in stdenv.mkDerivation rec { INSTALL_TARGET ''; + outputs = [ "dev" "out" "tools" ]; + preConfigure = "cd nss"; makeFlags = [ - "NSPR_INCLUDE_DIR=${nspr}/include/nspr" - "NSPR_LIB_DIR=${nspr}/lib" + "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" + "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" "NSS_ENABLE_ECC=1" + "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; @@ -77,8 +78,11 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" done - '' + stdenv.lib.optionalString (!includeTools) '' - find $out/bin -type f \( -name nss-config -o -delete \) + + moveToOutput bin "$tools" + moveToOutput bin/nss-config "$dev" + moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example + rm "$out"/lib/*.a ''; meta = { diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 27193e045450b..bff367f750b39 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { - name = "ogre-paged-1.1.3"; + name = "ogre-paged-${version}"; + version = "1.2.0"; src = fetchurl { - url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz"; - sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq"; + url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz"; + sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82"; }; buildInputs = [ ois ogre libX11 boost ]; nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF"; + cmakeFlags = [ "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index e89cd880df13b..7f4b5ba2e3282 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ - --prefix PATH : ${openssl}/bin + --prefix PATH : ${openssl.bin}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index c4f8ef0ee6616..cc5a26a557d5d 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"; }; - outputs = [ "out" "man" ]; + # TODO: separate "out" and "bin" + outputs = [ "dev" "out" "man" "docdev" ]; buildInputs = [ openssl cyrus_sasl db groff ]; @@ -19,12 +20,10 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; - dontPatchELF = 1; # !!! - # Fixup broken libtool preFixup = '' - sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \ - -e 's,-lssl,-L${openssl}/lib -lssl,' \ + sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ + -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ -i $out/lib/libldap.la -i $out/lib/libldap_r.la ''; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 578d0219c0209..1b69563355bc7 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype +{ stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype , libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu , freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal , libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL -, qt4, poppler, librsvg, gtk }: +, qt4, poppler, librsvg, gtk +, withApps ? true }: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; @@ -20,11 +21,13 @@ stdenv.mkDerivation rec { pkgconfig kbproto SDL qt4 poppler librsvg gtk ]; + enableParallelBuilding = true; + cmakeFlags = [ "-DMATH_LIBRARY=" "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" - ]; + ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index b610f27d17cf9..8187fcedabf16 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj"; }; + outputs = [ "dev" "out" "man" "bin" ]; + setOutputFlags = false; + nativeBuildInputs = [ perl zlib ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -35,7 +38,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "MANDIR=$(out)/share/man" + "MANDIR=$(man)/share/man" ]; # Parallel building is broken in OpenSSL. @@ -48,8 +51,16 @@ stdenv.mkDerivation rec { rm "$out/lib/"*.a fi + mkdir -p $bin + mv $out/bin $bin/ + + mkdir $dev + mv $out/include $dev/ + # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc $out/bin/c_rehash + rm -r $out/etc/ssl/misc + + rmdir $out/etc/ssl/{certs,private} ''; postFixup = '' diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 081f71b498e18..1e0f419c5f73c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -16,8 +16,6 @@ let inherit sha256; }; - outputs = [ "out" "man" ]; - patches = [ ./use-etc-ssl-certs.patch ] ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch @@ -25,6 +23,9 @@ let (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch; + outputs = [ "dev" "out" "man" "bin" ]; + setOutputFlags = false; + nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -44,9 +45,7 @@ let "-DUSE_CRYPTODEV_DIGESTS" ]; - makeFlags = [ - "MANDIR=$(out)/share/man" - ]; + makeFlags = [ "MANDIR=$(man)/share/man" ]; # Parallel building is broken in OpenSSL. enableParallelBuilding = false; @@ -58,14 +57,20 @@ let rm "$out/lib/"*.a fi + mkdir -p $bin + mv $out/bin $bin/ + + mkdir $dev + mv $out/include $dev/ + # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc $out/bin/c_rehash + rm -r $out/etc/ssl/misc rmdir $out/etc/ssl/{certs,private} ''; postFixup = '' - # Check to make sure we don't depend on perl + # Check to make sure the main output doesn't depend on perl if grep -r '${perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index eefed304134f3..f2a9bdc123097 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5"; }; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; + buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; configureFlags = [ diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index bb619c7fda5f5..c4456035cca23 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz -, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection +{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz +, libintlOrEmpty, gobjectIntrospection }: with stdenv.lib; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { sha256 = "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"; }; - buildInputs = with stdenv.lib; [ gobjectIntrospection ] - ++ optional stdenv.isDarwin fontconfig; - nativeBuildInputs = [ pkgconfig ]; + outputs = [ "dev" "out" "bin" "docdev" ]; - propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + buildInputs = [ gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty; enableParallelBuilding = true; @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--without-x"; - postInstall = "rm -rf $out/share/gtk-doc"; - meta = with stdenv.lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 46e2da18aa1e8..908d1ea856f5d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt +, libusb1, libpcap, libXt, libpng }: stdenv.mkDerivation rec { @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ]; + buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap + libpng vtk qt4 libXt ]; meta = { homepage = http://pointclouds.org/; diff --git a/pkgs/development/libraries/pcre/CVE-2016-1283.patch b/pkgs/development/libraries/pcre/CVE-2016-1283.patch new file mode 100644 index 0000000000000..2c2dad29e9295 --- /dev/null +++ b/pkgs/development/libraries/pcre/CVE-2016-1283.patch @@ -0,0 +1,18 @@ +Index: pcre_compile.c +=================================================================== +--- a/pcre_compile.c (revision 1635) ++++ b/pcre_compile.c (revision 1636) +@@ -7311,7 +7311,12 @@ + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index afeffae3e5fa9..8bce1512d138a 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,43 +1,50 @@ -{ stdenv, lib, fetchurl, unicodeSupport ? true, cplusplusSupport ? true -, windows ? null +{ stdenv, fetchurl +, windows ? null, variant ? null, pcre , withCharSize ? 8 }: with stdenv.lib; -assert withCharSize != 8 -> !cplusplusSupport; +assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - charFlags = if withCharSize == 8 then [ ] - else if withCharSize == 16 then [ "--enable-pcre16" "--disable-pcre8" ] - else if withCharSize == 32 then [ "--enable-pcre32" "--disable-pcre8" ] - else abort "Invalid character size"; + version = "8.38"; + pname = if (variant == null) then "pcre" + else if (variant == "cpp") then "pcre-cpp" + else variant; in stdenv.mkDerivation rec { - name = "pcre${lib.optionalString (withCharSize != 8) (toString withCharSize)}-8.38"; - # FIXME: add "version" attribute and use it in URL + name = "${pname}-${version}"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2"; + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r"; }; - patches = - [ ]; + patches = [ + ./CVE-2016-1283.patch + ]; - outputs = [ "out" "doc" "man" ]; + outputs = [ "dev" "out" "bin" "doc" "man" ]; - # FIXME: Refactor into list! - configureFlags = '' - --enable-jit - ${lib.optionalString unicodeSupport "--enable-unicode-properties"} - ${lib.optionalString (!cplusplusSupport) "--disable-cpp"} - '' + lib.optionalString (charFlags != []) " ${toString charFlags}"; + configureFlags = [ + "--enable-jit" + "--enable-unicode-properties" + "--disable-cpp" + ] + ++ optional (variant != null) "--enable-${variant}"; doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra + postFixup = '' + moveToOutput bin/pcre-config "$dev" + '' + + optionalString (variant != null) '' + ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.so.*.*.* + ''; + crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") { buildInputs = [ windows.mingw_w64_pthreads.crossDrv ]; }; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 2d15e632152c7..2431bfafa71d7 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { preBuild = '' cp Makefile.linux Makefile - sed -i 's|/usr/include/libxml2|${libxml2}/include/libxml2|' Makefile - sed -i 's|-lxml2|-lxml2 -L${libxml2}/lib|' Makefile + sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile + sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile mkdir exe diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index cdeaa0cb1d96a..5744460008fd0 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; + outputs = [ "dev" "out" "bin" ]; # small man pages in $bin + buildInputs = [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 92777f001695c..ebcdcc2b3efdf 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "out" ] ++ lib.optional (!minimal) "doc"; + outputs = [ "dev" "out" ]; patches = [ ./datadir_env.patch ]; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 46d5128140151..5d8c2430ab9f9 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { make install # fixup .pc file to find alsa library - sed -i "s|-lasound|-L${alsaLib}/lib -lasound|" "$out/lib/pkgconfig/"*.pc + sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 51136c31aa13d..f67d877cda045 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; + outputs = [ "out" "lib" ]; + buildInputs = [ autoreconfHook zlib ]; doCheck = true; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 011e133720fb3..f2bac09f4bcb8 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullIterator.h + sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullLinkedList.h + ''; + meta = { homepage = http://www.qhull.org/; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 64d8570460cb5..359a4341537dc 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + runHook preConfigure + qmake PREFIX=$out + runHook postConfigure + ''; installPhase=''make INSTALL_ROOT="$out" install''; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 728d220bb42f9..28271a7a0a081 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -51,9 +51,9 @@ stdenv.mkDerivation { ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft - -L${libXft}/lib -I${libXft}/include - -L${libXft.freetype}/lib -I${libXft.freetype}/include - -L${libXft.fontconfig}/lib -I${libXft.fontconfig}/include" else "-no-xft"} + -L${libXft.out}/lib -I${libXft.dev}/include + -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include + -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} "; patches = [ diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 17e0485b29fe0..788fb87414023 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -53,19 +53,24 @@ stdenv.mkDerivation rec { ./libressl.patch (substituteAll { src = ./dlopen-absolute-paths.diff; - inherit cups icu libXfixes; - glibc = stdenv.cc.libc; + cups = if cups != null then cups.out else null; + icu = icu.out; + libXfixes = libXfixes.out; + glibc = stdenv.cc.libc.out; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; }) ] ++ stdenv.lib.optional gtkStyle (substituteAll { src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter - gconf = GConf; - inherit gnome_vfs libgnomeui gtk; + gconf = GConf.out; + gtk = gtk.out; + libgnomeui = libgnomeui.out; + gnome_vfs = gnome_vfs.out; }) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; - inherit gtk gdk_pixbuf; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; }) ++ [(fetchpatch { name = "fix-medium-font.patch"; @@ -113,7 +118,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi - libSM zlib libpng openssl dbus.libs freetype fontconfig glib ] + libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used ++ optional mesaSupported mesa_glu ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib @@ -131,7 +136,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 9b1324d11373f..df2fb8ad18622 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -37,21 +37,19 @@ let inherit src; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; dontAddPrefix = args.dontAddPrefix or true; dontFixLibtool = args.dontFixLibtool or true; configureScript = args.configureScript or "qmake"; + outputs = args.outputs or [ "dev" "out" ]; + setOutputFlags = false; + enableParallelBuilding = args.enableParallelBuilding or true; - meta = { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - } // (args.meta or {}); + meta = self.qtbase.meta // (args.meta or {}); }); addPackages = self: with self; @@ -110,7 +108,10 @@ let ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh; }; -in makeScope pkgs.newScope addPackages + self = makeScope pkgs.newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh new file mode 100644 index 0000000000000..7ca3e33b613c2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh @@ -0,0 +1,5 @@ +fixQtModuleCMakeConfig() { + local module="$1" + sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \ + -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake" +} diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix index 36bd3822bf730..0585601db765a 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper +{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig , srcs , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi @@ -14,8 +14,7 @@ , mysql ? null, postgresql ? null # options -, mesaSupported, mesa, mesa_glu -, buildDocs ? false +, mesaSupported, mesa , buildExamples ? false , buildTests ? false , developerBuild ? false @@ -37,6 +36,8 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; + outputs = [ "dev" "out" ]; + postUnpack = '' mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase ''; @@ -60,27 +61,27 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor}" + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl}" + --replace "@openssl@" "${openssl.out}" substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus}" + --replace "@dbus_libs@" "${dbus.lib}" substituteInPlace \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11}" + --replace "@libX11@" "${libX11.out}" '' + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk}" \ + --replace "@gtk@" "${gtk.out}" \ --replace "@gnome_vfs@" "${gnome_vfs}" \ --replace "@libgnomeui@" "${libgnomeui}" \ --replace "@gconf@" "${GConf}" @@ -88,16 +89,40 @@ stdenv.mkDerivation { + lib.optionalString mesaSupported '' substituteInPlace \ qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \ - --replace "@mesa@" "${mesa}" - substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" + --replace "@mesa_lib@" "${mesa.out}" + substituteInPlace qtbase/mkspecs/common/linux.conf \ + --replace "@mesa_lib@" "${mesa.out}" \ + --replace "@mesa_inc@" "${mesa.dev}" ''; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" - export configureFlags+=" -docdir $out/share/doc/qt5" + _multioutQtDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + mkdir -p "$dev/lib" + lndir -silent "$out/lib" "$dev/lib" + if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi + if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi + } + preFixupHooks+=(_multioutQtDevs) + + configureFlags+="\ + -plugindir $out/lib/qt5/plugins \ + -importdir $out/lib/qt5/imports \ + -qmldir $out/lib/qt5/qml \ + -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; @@ -172,40 +197,46 @@ stdenv.mkDerivation { # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] - # Qt doesn't directly need GLU (just GL), but many apps use, it's small and - # doesn't remain a runtime-dep if not used - ++ lib.optionals mesaSupported [ mesa mesa_glu ] - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optional mesaSupported mesa; buildInputs = [ bison flex gperf ruby ] - ++ lib.optional developerBuild gdb; - - nativeBuildInputs = [ python perl pkgconfig ]; + ++ lib.optional developerBuild gdb + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql + ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; - propagatedNativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - postInstall = + postFixup = '' # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - '' - + lib.optionalString buildDocs '' - make docs && make install_docs + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri" + + fixQtModuleCMakeConfig "Concurrent" + fixQtModuleCMakeConfig "Core" + fixQtModuleCMakeConfig "DBus" + fixQtModuleCMakeConfig "Gui" + fixQtModuleCMakeConfig "Network" + fixQtModuleCMakeConfig "OpenGL" + fixQtModuleCMakeConfig "OpenGLExtensions" + fixQtModuleCMakeConfig "PrintSupport" + fixQtModuleCMakeConfig "Sql" + fixQtModuleCMakeConfig "Test" + fixQtModuleCMakeConfig "Widgets" + fixQtModuleCMakeConfig "Xml" ''; inherit lndir; @@ -214,9 +245,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - homepage = http://qt-project.org; + homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch index d6e08cd24106c..d5c4c2b97cb60 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch @@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxi QLibrary lib(QLatin1String("GL")); + if (!lib.load()) { + // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); ++ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); + } glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); } diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch index 10115e8144ad3..56ee0a411d4d8 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch @@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa@/include -+QMAKE_LIBDIR_OPENGL = @mesa@/lib ++QMAKE_INCDIR_OPENGL = @mesa_inc@/include ++QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh index b86b6df28ac89..c44cd2234d76a 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh @@ -1,45 +1,26 @@ if [[ -z "$QMAKE" ]]; then -linkDependencyDir() { +_qtLinkDependencyDir() { @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2" if [[ -n "$NIX_QT_SUBMODULE" ]]; then find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs" fi } -addQtModule() { - if [[ -d "$1/mkspecs" ]]; then +_qtLinkModule() { + if [ -d "$1/mkspecs" ]; then # $1 is a Qt module - linkDependencyDir "$1" mkspecs + _qtLinkDependencyDir "$1" mkspecs for dir in bin include lib share; do - if [[ -d "$1/$dir" ]]; then - linkDependencyDir "$1" "$dir" + if [ -d "$1/$dir" ]; then + _qtLinkDependencyDir "$1" "$dir" fi done fi } -propagateRuntimeDeps() { - local propagated - for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; 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 - break - fi - done -} - -rmQtModules() { +_qtRmModules() { cat "$out/nix-support/qt-inputs" | while read file; do if [[ -h "$out/$file" ]]; then rm "$out/$file" @@ -55,14 +36,65 @@ rmQtModules() { rm "$out/nix-support/qt-inputs" } -rmQMake() { +addToSearchPathOnceWithCustomDelimiter() { + local delim="$1" + local search="$2" + local target="$3" + local dirs + local exported + IFS="$delim" read -a dirs <<< "${!search}" + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$target" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$target\"" + fi +} + +addToSearchPathOnce() { + addToSearchPathOnceWithCustomDelimiter ':' "$@" +} + +propagateOnce() { + addToSearchPathOnceWithCustomDelimiter ' ' "$@" +} + +_qtPropagateRuntimeDependencies() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +_qtRmQmake() { rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" } -setQMakePath() { +_qtSetQmakePath() { export PATH="$qtOut/bin${PATH:+:}$PATH" } +_qtMultioutModuleDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + qtOut="" if [[ -z "$NIX_QT_SUBMODULE" ]]; then qtOut=`mktemp -d` @@ -72,7 +104,7 @@ fi mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" -cp "@out@/bin/qmake" "$qtOut/bin" +cp "@dev@/bin/qmake" "$qtOut/bin" cat >"$qtOut/bin/qt.conf" <<EOF [Paths] Prefix = $qtOut @@ -84,17 +116,20 @@ EOF export QMAKE="$qtOut/bin/qmake" -envHooks+=(addQtModule propagateRuntimeDeps) -preConfigurePhases+=(setQMakePath) +envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies) +# Set PATH to find qmake first in a preConfigure hook +# It must run after all the envHooks! +preConfigureHooks+=(_qtSetQmakePath) +preFixupHooks+=(_qtMultioutDevs) if [[ -n "$NIX_QT_SUBMODULE" ]]; then - preFixupPhases+=(rmQtModules) - postPhases+=(rmQMake) + postInstallHooks+=(_qtRmQmake _qtRmModules) + preFixupHooks+=(_qtMultioutModuleDevs) fi fi if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" export NIX_QT_PIC=1 fi diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix index 95cd6fea79b40..35538c7261f1d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Bluetooth" + fixQtModuleCMakeConfig "Nfc" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix index 9181c37b22583..e2219642a1224 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix @@ -5,4 +5,10 @@ qtSubmodule { patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; + postFixup = '' + fixQtModuleCMakeConfig "Qml" + fixQtModuleCMakeConfig "Quick" + fixQtModuleCMakeConfig "QuickTest" + fixQtModuleCMakeConfig "QuickWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix index b860a73ef8900..503a0f7ce4f55 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtenginio"; qtInputs = [ qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Enginio" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix index 1e134057c4b47..0e2ad8bafb30d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; + postFixup = '' + fixQtModuleCMakeConfig "Location" + fixQtModuleCMakeConfig "Positioning" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix index b6b4d8ea0cf4e..8db8fa5f4b969 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix @@ -9,4 +9,8 @@ qtSubmodule { pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; configureFlags = "GST_VERSION=1.0"; + postFixup = '' + fixQtModuleCMakeConfig "Multimedia" + fixQtModuleCMakeConfig "MultimediaWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix index d1c7bb389a49c..d81abbcd6140d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix @@ -4,4 +4,7 @@ qtSubmodule { name = "qtquick1"; patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; + postFixup = '' + fixQtModuleCMakeConfig "Declarative" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix index 127766e2ebd61..b81a43aeadb04 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix @@ -4,4 +4,7 @@ qtSubmodule { name = "qtscript"; qtInputs = [ qtbase qttools ]; patches = [ ./0001-glib-2.32.patch ]; + postFixup = '' + fixQtModuleCMakeConfig "Script" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix index 61e64dc47e4dc..5776f45a70689 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtsensors"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Sensors" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch index 6636cc9265a85..3a813dc800745 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch @@ -16,10 +16,10 @@ index 6f2cabd..81b9849 100644 { if (!udevLibrary->isLoaded()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); if (!udevLibrary->load()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); if (!udevLibrary->load()) { qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); return false; diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix index fa7383fc1e767..2c9575f122e78 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix @@ -1,7 +1,16 @@ -{ qtSubmodule, qtbase }: +{ qtSubmodule, qtbase, substituteAll, libudev }: qtSubmodule { name = "qtserialport"; qtInputs = [ qtbase ]; - patches = [ ./0001-dlopen-serialport-udev.patch ]; + + patches = [ + (substituteAll { + src = ./0001-dlopen-serialport-udev.patch; + libudev = libudev.out; + }) + ]; + postFixup = '' + fixQtModuleCMakeConfig "SerialPort" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix index b9ccac7cf9331..a460d6da4c2ad 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtsvg"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "Svg" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix index 65edc45081283..16887c4265a81 100644 --- a/pkgs/development/libraries/qt-5/5.4/qttools.nix +++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix @@ -3,4 +3,13 @@ qtSubmodule { name = "qttools"; qtInputs = [ qtbase ]; + postFixup = '' + moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qtpaths" "$out" + + fixQtModuleCMakeConfig "Designer" + fixQtModuleCMakeConfig "Help" + fixQtModuleCMakeConfig "LinguistTools" + fixQtModuleCMakeConfig "UiTools" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch index f3b9d407bd726..1c360cd81aa2d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch @@ -16,13 +16,13 @@ index 60ff317..da8ac69 100644 { m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); m_loaded = m_libUdev.load(); if (resolveMethods()) return true; - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); m_loaded = m_libUdev.load(); return resolveMethods(); } diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix index 596c02d39afb1..7ed3017b95a3d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix @@ -1,6 +1,6 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt -, sqlite, udev +, sqlite, libudev , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll , flashplayerFix ? false @@ -18,16 +18,21 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - inherit gtk gdk_pixbuf; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - inherit gtk; + gtk = gtk.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; - inherit udev; + udev = libudev.out; }; in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] ++ [ dlopen-webkit-udev ]; + postFixup = '' + fixQtModuleCMakeConfig "WebKit" + fixQtModuleCMakeConfig "WebKitWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix index fbdfbbcf0dbed..c0d0f9e7d714e 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtwebsockets"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "WebSockets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix index a765161e2d7ea..db92f1353627d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtx11extras"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "X11Extras" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix index 9a8ddbba2bd24..3b22132e4c38e 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtxmlpatterns"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "XmlPatterns" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 9b1324d11373f..955d57350c294 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -1,15 +1,20 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./fetchsrcs.sh to point to the updated URL. -# 2. Run ./fetchsrcs.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. Be sure to check if -# any new components have been added and package them as necessary. +/* + +# Minor Updates + +1. Edit ./fetchsrcs.sh to point to the updated URL. +2. Run ./fetchsrcs.sh. +3. Build and enjoy. + +# Major Updates + +1. Make a copy of this directory. (We like to keep the old version around + for a short time after major updates.) +2. Delete the tmp/ subdirectory of the copy. +3. Follow the minor update instructions above. +4. Package any new Qt modules, if necessary. + +*/ { pkgs @@ -37,21 +42,19 @@ let inherit src; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; dontAddPrefix = args.dontAddPrefix or true; dontFixLibtool = args.dontFixLibtool or true; configureScript = args.configureScript or "qmake"; + outputs = args.outputs or [ "dev" "out" ]; + setOutputFlags = args.setOutputFlags or false; + enableParallelBuilding = args.enableParallelBuilding or true; - meta = { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - } // (args.meta or {}); + meta = self.qtbase.meta // (args.meta or {}); }); addPackages = self: with self; @@ -61,6 +64,7 @@ let qtbase = callPackage ./qtbase { mesa = pkgs.mesa_noglu; + harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; @@ -110,7 +114,10 @@ let ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh; }; -in makeScope pkgs.newScope addPackages + self = makeScope pkgs.newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh new file mode 100644 index 0000000000000..7ca3e33b613c2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh @@ -0,0 +1,5 @@ +fixQtModuleCMakeConfig() { + local module="$1" + sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \ + -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake" +} diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh index d61665455bf45..f29bbb73639ba 100644 --- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -1,11 +1,3 @@ -addQtDependency() { - addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" - addToSearchPath XDG_DATA_DIRS "$1/share" -} - wrapQtProgram() { local prog="$1" shift @@ -13,8 +5,8 @@ wrapQtProgram() { --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ - --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ - --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \ "$@" } @@ -27,16 +19,16 @@ makeQtWrapper() { --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ - --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ - --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \ "$@" } # cannot use addToSearchPath because these directories may not exist yet -export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" -export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" -export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" -export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg" -export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" - -envHooks+=(addQtDependency) +export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" +export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" +export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" +export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg" +export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share" +export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg" +export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share" diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index ffa0a95be2c08..35410d55e66d4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper +{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig , srcs , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 -, zlib, libjpeg, libpng, libtiff, sqlite, icu, harfbuzz +, fontconfig, freetype, harfbuzz +, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 +, zlib, libjpeg, libpng, libtiff, sqlite, icu , coreutils, bison, flex, gdb, gperf, lndir, ruby , python, perl, pkgconfig @@ -14,8 +15,7 @@ , mysql ? null, postgresql ? null # options -, mesaSupported, mesa, mesa_glu -, buildDocs ? false +, mesaSupported, mesa , buildExamples ? false , buildTests ? false , developerBuild ? false @@ -43,6 +43,8 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; + outputs = [ "dev" "out" ]; + postUnpack = '' mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase ''; @@ -70,44 +72,68 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc}" + --replace "@glibc@" "${stdenv.cc.libc.out}" substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor}" + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl}" + --replace "@openssl@" "${openssl.out}" substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus}" + --replace "@dbus_libs@" "${dbus.lib}" substituteInPlace \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11}" + --replace "@libX11@" "${libX11.out}" '' + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk}" \ - --replace "@gnome_vfs@" "${gnome_vfs}" \ - --replace "@libgnomeui@" "${libgnomeui}" \ - --replace "@gconf@" "${GConf}" + --replace "@gtk@" "${gtk.out}" \ + --replace "@gnome_vfs@" "${gnome_vfs.out}" \ + --replace "@libgnomeui@" "${libgnomeui.out}" \ + --replace "@gconf@" "${GConf.out}" '' + lib.optionalString mesaSupported '' substituteInPlace \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa@" "${mesa}" - substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" + --replace "@mesa_lib@" "${mesa.out}" + substituteInPlace qtbase/mkspecs/common/linux.conf \ + --replace "@mesa_lib@" "${mesa.out}" \ + --replace "@mesa_inc@" "${mesa.dev}" ''; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" - export configureFlags+=" -docdir $out/share/doc/qt5" + _multioutQtDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + mkdir -p "$dev/lib" + lndir -silent "$out/lib" "$dev/lib" + if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi + if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi + } + preFixupHooks+=(_multioutQtDevs) + + configureFlags+="\ + -plugindir $out/lib/qt5/plugins \ + -importdir $out/lib/qt5/imports \ + -qmldir $out/lib/qt5/qml \ + -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; @@ -184,40 +210,53 @@ stdenv.mkDerivation { # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ + dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + + # Image formats + libjpeg libpng libtiff + + # Text rendering + fontconfig freetype harfbuzz icu + + # X11 libs xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre16 - zlib libjpeg libpng libtiff sqlite icu harfbuzz xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] - # Qt doesn't directly need GLU (just GL), but many apps use, it's small and - # doesn't remain a runtime-dep if not used - ++ lib.optionals mesaSupported [ mesa mesa_glu ] - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optional mesaSupported mesa; buildInputs = [ bison flex gperf ruby ] - ++ lib.optional developerBuild gdb; - - nativeBuildInputs = [ python perl pkgconfig ]; + ++ lib.optional developerBuild gdb + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql + ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; - propagatedNativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - postInstall = + postFixup = '' # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - '' - + lib.optionalString buildDocs '' - make docs && make install_docs + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri + + fixQtModuleCMakeConfig "Concurrent" + fixQtModuleCMakeConfig "Core" + fixQtModuleCMakeConfig "DBus" + fixQtModuleCMakeConfig "Gui" + fixQtModuleCMakeConfig "Network" + fixQtModuleCMakeConfig "OpenGL" + fixQtModuleCMakeConfig "OpenGLExtensions" + fixQtModuleCMakeConfig "PrintSupport" + fixQtModuleCMakeConfig "Sql" + fixQtModuleCMakeConfig "Test" + fixQtModuleCMakeConfig "Widgets" + fixQtModuleCMakeConfig "Xml" ''; inherit lndir; @@ -226,9 +265,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - homepage = http://qt-project.org; + homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch index 14411a95f3ac2..59f510ac54dab 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch @@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_in QLibrary lib(QLatin1String("GL")); + if (!lib.load()) { + // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa@/lib/libGL")); ++ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); + } glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch index 10115e8144ad3..56ee0a411d4d8 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch @@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa@/include -+QMAKE_LIBDIR_OPENGL = @mesa@/lib ++QMAKE_INCDIR_OPENGL = @mesa_inc@/include ++QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index b86b6df28ac89..9cf1ef9ccb614 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -1,45 +1,26 @@ if [[ -z "$QMAKE" ]]; then -linkDependencyDir() { +_qtLinkDependencyDir() { @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2" if [[ -n "$NIX_QT_SUBMODULE" ]]; then find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs" fi } -addQtModule() { - if [[ -d "$1/mkspecs" ]]; then +_qtLinkModule() { + if [ -d "$1/mkspecs" ]; then # $1 is a Qt module - linkDependencyDir "$1" mkspecs + _qtLinkDependencyDir "$1" mkspecs for dir in bin include lib share; do - if [[ -d "$1/$dir" ]]; then - linkDependencyDir "$1" "$dir" + if [ -d "$1/$dir" ]; then + _qtLinkDependencyDir "$1" "$dir" fi done fi } -propagateRuntimeDeps() { - local propagated - for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; 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 - break - fi - done -} - -rmQtModules() { +_qtRmModules() { cat "$out/nix-support/qt-inputs" | while read file; do if [[ -h "$out/$file" ]]; then rm "$out/$file" @@ -55,14 +36,66 @@ rmQtModules() { rm "$out/nix-support/qt-inputs" } -rmQMake() { +addToSearchPathOnceWithCustomDelimiter() { + local delim="$1" + local search="$2" + local target="$3" + local dirs + local exported + IFS="$delim" read -a dirs <<< "${!search}" + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$target" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$target\"" + fi +} + +addToSearchPathOnce() { + addToSearchPathOnceWithCustomDelimiter ':' "$@" +} + +propagateOnce() { + addToSearchPathOnceWithCustomDelimiter ' ' "$@" +} + +_qtPropagateRuntimeDependencies() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + propagateOnce propagatedUserEnvPkgs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +_qtRmQmake() { rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" } -setQMakePath() { +_qtSetQmakePath() { export PATH="$qtOut/bin${PATH:+:}$PATH" } +_qtMultioutModuleDevs() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + qtOut="" if [[ -z "$NIX_QT_SUBMODULE" ]]; then qtOut=`mktemp -d` @@ -72,7 +105,7 @@ fi mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" -cp "@out@/bin/qmake" "$qtOut/bin" +cp "@dev@/bin/qmake" "$qtOut/bin" cat >"$qtOut/bin/qt.conf" <<EOF [Paths] Prefix = $qtOut @@ -84,17 +117,20 @@ EOF export QMAKE="$qtOut/bin/qmake" -envHooks+=(addQtModule propagateRuntimeDeps) -preConfigurePhases+=(setQMakePath) +envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies) +# Set PATH to find qmake first in a preConfigure hook +# It must run after all the envHooks! +preConfigureHooks+=(_qtSetQmakePath) +preFixupHooks+=(_qtMultioutDevs) if [[ -n "$NIX_QT_SUBMODULE" ]]; then - preFixupPhases+=(rmQtModules) - postPhases+=(rmQMake) + postInstallHooks+=(_qtRmQmake _qtRmModules) + preFixupHooks+=(_qtMultioutModuleDevs) fi fi if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" export NIX_QT_PIC=1 fi diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix index 95cd6fea79b40..35538c7261f1d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Bluetooth" + fixQtModuleCMakeConfig "Nfc" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix index 328d8aee72bdf..407513f784989 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix @@ -5,4 +5,10 @@ qtSubmodule { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; + postFixup = '' + fixQtModuleCMakeConfig "Qml" + fixQtModuleCMakeConfig "Quick" + fixQtModuleCMakeConfig "QuickTest" + fixQtModuleCMakeConfig "QuickWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix index b860a73ef8900..503a0f7ce4f55 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtenginio"; qtInputs = [ qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Enginio" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix index 1e134057c4b47..0e2ad8bafb30d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix @@ -3,4 +3,8 @@ qtSubmodule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; + postFixup = '' + fixQtModuleCMakeConfig "Location" + fixQtModuleCMakeConfig "Positioning" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix index b6b4d8ea0cf4e..8db8fa5f4b969 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix @@ -9,4 +9,8 @@ qtSubmodule { pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; configureFlags = "GST_VERSION=1.0"; + postFixup = '' + fixQtModuleCMakeConfig "Multimedia" + fixQtModuleCMakeConfig "MultimediaWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index 64937b3dcd370..4bf92fa01473c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -4,4 +4,7 @@ qtSubmodule { name = "qtquick1"; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; + postFixup = '' + fixQtModuleCMakeConfig "Declarative" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix index 127766e2ebd61..b81a43aeadb04 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix @@ -4,4 +4,7 @@ qtSubmodule { name = "qtscript"; qtInputs = [ qtbase qttools ]; patches = [ ./0001-glib-2.32.patch ]; + postFixup = '' + fixQtModuleCMakeConfig "Script" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix index 61e64dc47e4dc..5776f45a70689 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtsensors"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "Sensors" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch index 6636cc9265a85..3a813dc800745 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch @@ -16,10 +16,10 @@ index 6f2cabd..81b9849 100644 { if (!udevLibrary->isLoaded()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); if (!udevLibrary->load()) { - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); if (!udevLibrary->load()) { qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); return false; diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix index fa7383fc1e767..3f409f9c0e084 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix @@ -1,7 +1,15 @@ -{ qtSubmodule, qtbase }: +{ qtSubmodule, qtbase, substituteAll, libudev }: qtSubmodule { name = "qtserialport"; qtInputs = [ qtbase ]; - patches = [ ./0001-dlopen-serialport-udev.patch ]; + patches = [ + (substituteAll { + src = ./0001-dlopen-serialport-udev.patch; + libudev = libudev.out; + }) + ]; + postFixup = '' + fixQtModuleCMakeConfig "SerialPort" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix index b9ccac7cf9331..a460d6da4c2ad 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtsvg"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "Svg" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix index 65edc45081283..1472691c52547 100644 --- a/pkgs/development/libraries/qt-5/5.5/qttools.nix +++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix @@ -3,4 +3,14 @@ qtSubmodule { name = "qttools"; qtInputs = [ qtbase ]; + postFixup = '' + moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qtpaths" "$out" + + fixQtModuleCMakeConfig "Designer" + fixQtModuleCMakeConfig "Help" + fixQtModuleCMakeConfig "LinguistTools" + fixQtModuleCMakeConfig "UiPlugin" + fixQtModuleCMakeConfig "UiTools" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch index f3b9d407bd726..1c360cd81aa2d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch @@ -16,13 +16,13 @@ index 60ff317..da8ac69 100644 { m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); m_loaded = m_libUdev.load(); if (resolveMethods()) return true; - m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); m_loaded = m_libUdev.load(); return resolveMethods(); } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index 596c02d39afb1..b441a2448d769 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -1,6 +1,6 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt -, sqlite, udev +, sqlite, libudev , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll , flashplayerFix ? false @@ -18,16 +18,21 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - inherit gtk gdk_pixbuf; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - inherit gtk; + gtk = gtk.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; - inherit udev; + libudev = libudev.out; }; in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] ++ [ dlopen-webkit-udev ]; + postFixup = '' + fixQtModuleCMakeConfig "WebKit" + fixQtModuleCMakeConfig "WebKitWidgets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix index fbdfbbcf0dbed..c0d0f9e7d714e 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtwebsockets"; qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + fixQtModuleCMakeConfig "WebSockets" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix index a765161e2d7ea..db92f1353627d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtx11extras"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "X11Extras" + ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix index 9a8ddbba2bd24..3b22132e4c38e 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix @@ -3,4 +3,7 @@ qtSubmodule { name = "qtxmlpatterns"; qtInputs = [ qtbase ]; + postFixup = '' + fixQtModuleCMakeConfig "XmlPatterns" + ''; } diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 4db9d8b4665fe..7ef1a9212a148 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; }; - configurePhase = "cd quazip && qmake quazip.pro"; + configurePhase = '' + runHook preConfigure + cd quazip && qmake quazip.pro + runHook postConfigure + ''; installFlags = "INSTALL_ROOT=$(out)"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index d4819d70bfc82..a99573ca5e43a 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - configurePhase = "qmake -after doc.path=$out/share/doc/${name} -r"; + configurePhase = '' + runHook preConfigure + qmake -after doc.path=$out/share/doc/${name} -r + runHook postConfigure + ''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 4aa7c0bc7d5a8..451784261f82b 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri ''; - configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; + configurePhase = '' + runHook preConfigure + qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r + runHook postConfigure + ''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 947b06021cd21..32fff70ebfbaa 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib perl ]; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index f770fabb35d34..11d4271b168b6 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; }; + outputs = [ "dev" "out" "doc" ]; + propagatedBuildInputs = [ncurses]; patchFlags = "-p0"; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 33f5ba867d6a1..2df7d05189425 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, orc, pkgconfig}: +{ stdenv, fetchurl, orc, pkgconfig }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -11,16 +11,12 @@ stdenv.mkDerivation { sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - buildInputs = [orc pkgconfig]; + outputs = [ "dev" "out" "docdev" ]; - # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11. - # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See: - # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html - preBuild = '' - substituteInPlace Makefile \ - --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \ - --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools" - ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ orc ]; + + doCheck = true; meta = with stdenv.lib; { homepage = "http://diracvideo.org/"; diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix new file mode 100644 index 0000000000000..5f2263d821d02 --- /dev/null +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, boost +}: + +stdenv.mkDerivation rec { + name = "ispike-${version}"; + version = "2.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/ispike/${name}.tar.gz"; + sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; + }; + + buildInputs = [ cmake boost ]; + + meta = { + description = "Spiking neural interface between iCub and a spiking neural simulator"; + homepage = https://sourceforge.net/projects/ispike/; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; + + +} diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 7dcde2a09a8c5..f88bd64f597be 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb}/lib:${stdenv.cc.libc}/lib + RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index fe7a73fa0fe7a..2da555635b294 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen ]; configurePhase = '' + runHook preConfigure qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 + runHook postConfigure ''; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index bf1f38fbb83d7..e83718673aaea 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -7,20 +7,29 @@ stdenv.mkDerivation rec { sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy"; }; + outputs = [ "dev" "out" "doc" ]; + # Fix some wrong hardcoded paths preConfigure = '' - sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure - sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c + sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure + sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c sed -i -e "s|/bin/ln|ln|" src/Makefile.in + sed -i -e "s|-ltermcap|-lncurses|" ./configure ''; configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; - buildInputs = [ncurses pcre libpng zlib readline]; + buildInputs = [ pcre libpng zlib readline ]; + propagatedBuildInputs = [ ncurses ]; + + postInstall = '' + find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \; + sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc + ''; - meta = { + meta = with stdenv.lib; { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; homepage = http://www.jedsoft.org/slang/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index fe52571e1478c..76788aa791bc9 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/smpeg-config \ --prefix PATH ":" "${pkgconfig}/bin" \ - --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig" + --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; meta = { diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 9a1c00e63b9d3..8e3cf899e40b4 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "speex-1.2rc2"; - + src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac ''; - + + outputs = [ "dev" "out" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw speexdsp ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 7112afbea8a29..56b1900837ac6 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch ]; postPatch = "sed '3i#include <stdint.h>' -i ./include/speex/speexdsp_config_types.h.in"; + outputs = [ "dev" "out" "doc" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ fftw ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 24be2c2a9c85d..feb5e5d30407a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha1 = "c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29"; }; + outputs = [ "dev" "out" "bin" ]; + buildInputs = lib.optionals interactive [ readline ncurses ]; configureFlags = [ "--enable-threadsafe" ]; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 58e5d0864d3fb..31fc5401e7549 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl }: +let + SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; +in stdenv.mkDerivation { name = "tbb-4.4-u2"; @@ -13,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/{lib,share/doc} - cp "build/"*release*"/"*so* $out/lib/ + cp "build/"*release*"/"*${SHLIB_EXT}* $out/lib/ mv include $out/ rm $out/include/index.html mv doc/html $out/share/doc/tbb @@ -33,7 +36,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 0b210a589d417..b8969588b3c55 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ - -e 's|-lz|-L${zlib}/lib -lz|g; - s|-lbz2|-L${bzip2}/lib -lbz2|g' + -e 's|-lz|-L${zlib.out}/lib -lz|g; + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' ''; meta = { diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 5084fc3c10b1e..6942107d146b6 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.6.1"; + name = "libva-intel-driver-1.6.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1nsnl7gix22jbxqm7d5i3fk9gafwayhnsc3qjhbzxs6bbsffjmin"; + sha256 = "1zl51mdxfmnn33r4b0y5qxwlkqfw919aqphsq60d50pwrvdmk1xz"; }; patchPhase = '' diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 0510fde811c69..60e332de0c3d4 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto +, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: @@ -8,18 +8,18 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; + sha256 = "1p307ly1yyqjnzn9dbv78yffql2qszn84qk74lwanl3gma8fgxjb"; }; configureFlags = "--with-scanner --disable-documentation"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ]; + buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; meta = { description = "Reference implementation of the wayland protocol"; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix new file mode 100644 index 0000000000000..0ae9d9d59c8ac --- /dev/null +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl, pkgconfig +, wayland +}: + +stdenv.mkDerivation rec { + name = "wayland-protocols-${version}"; + version = "1.3"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "0byqvrsm6bkvylvzqy8wh5wpszwl5ra1z0yjqzqmw8przlrhdkbb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wayland ]; + + meta = { + description = "Wayland protocol extensions"; + homepage = http://wayland.freedesktop.org/; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix new file mode 100644 index 0000000000000..70467a253600a --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.12.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.12.0"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ koral ]; + }; + + preConfigure = "patchShebangs Tools"; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "19jyvyw8ss4bacq3f7ybdb0r16r84q12j2bpciyj9jqvzpw091m6"; + }; + + patches = [ ./finding-harfbuzz-icu.patch ]; + + cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base}/include/gstreamer-1.0"; + + nativeBuildInputs = [ + cmake perl python ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ] ++ (with xlibs; [ libXdmcp ]); + + buildInputs = [ + gtk2 wayland libwebp enchant libnotify + libxml2 libsecret libxslt harfbuzz libpthreadstubs + gst-plugins-base libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index e8f0a3d4da7e8..cc7644f742d5c 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, python, ruby, bison, gperf, flex , pkgconfig, which, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant, sqlite -, libxml2, libsoup, libsecret, libxslt, harfbuzz +, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base , withGtk2 ? false , enableIntrospection ? !stdenv.isDarwin @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libwebp enchant libxml2 libxslt - gst-plugins-base sqlite + gst-plugins-base sqlite xorg.libXt ] ++ optionals enableCredentialStorage [ libsecret ] ++ (if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 1abfcbb6c860e..cf22eb3aaddee 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? false, geoclue2, sqlite +, enableGeoLocation ? false, geoclue2, sqlite, xorg , enableCredentialStorage ? !stdenv.isDarwin , gst-plugins-base, readline, libedit }: @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libwebp enchant libnotify libxml2 libxslt harfbuzz libpthreadstubs - gst-plugins-base + gst-plugins-base xorg.libXt ] ++ optionals enableCredentialStorage [ libsecret ] ++ (if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 8660d15e06a38..4dec0555ae9fe 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsaLib ]; + buildInputs = [ alsaLib stdenv.cc.libc/*couldn't find libm*/ ]; preConfigure = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 50220c227f7c8..e023665f07017 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { # These variables are used by configure to find some dependencies. SEARCH_INCLUDE = - "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; + "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = - "${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib " - + optionalString withMesa "${mesa}/lib "; + "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " + + optionalString withMesa "${mesa.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 3c24234349392..754b76de06174 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,${stdenv.shell}, configure version.sh ''; + outputs = [ "out" "lib" ]; # leaving 52 kB of headers + configureFlags = [ "--enable-shared" ] ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 57c66f310fbe2..057be97ce96bf 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "xvidcore-${version}"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; - sha256 = "0m5g75qvapr7xpywg6a83v5x19kw1nm9l2q48lg7jvvpba0bmqdh"; + sha256 = "1xwbmp9wqshc0ckm970zdpi0yvgqxlqg0s8bkz98mnr8p2067bsz"; }; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 77ab0f8ffa9ca..6d0f81859218d 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -2,7 +2,7 @@ let version = "1.2.8"; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "zlib-${version}"; src = fetchurl { @@ -20,18 +20,34 @@ stdenv.mkDerivation (rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - configureFlags = if static then "" else "--shared"; + outputs = [ "dev" "out" "static" ]; + setOutputFlags = false; + outputDoc = "dev"; # single tiny man3 page + preConfigure = '' if test -n "$crossConfig"; then export CC=$crossConfig-gcc - configureFlags=${if static then "" else "--shared"} fi ''; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; + configureFlags = stdenv.lib.optional (!static) "--shared"; + + postInstall = '' + moveToOutput lib/libz.a "$static" + '' + # jww (2015-01-06): Sometimes this library install as a .so, even on + # Darwin; others time it installs as a .dylib. I haven't yet figured out + # what causes this difference. + + stdenv.lib.optionalString stdenv.isDarwin '' + for file in $out/lib/*.so* $out/lib/*.dylib* ; do + install_name_tool -id "$file" $file + done + ''; + # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; @@ -60,13 +76,5 @@ stdenv.mkDerivation (rec { license = licenses.zlib; platforms = platforms.all; }; -} // (if stdenv.isDarwin then { - postInstall = '' - # jww (2015-01-06): Sometimes this library install as a .so, even on - # Darwin; others time it installs as a .dylib. I haven't yet figured out - # what causes this difference. - for file in $out/lib/*.so* $out/lib/*.dylib* ; do - install_name_tool -id "$file" $file - done - ''; -} else {})) +} + diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 595c98f76aaa2..63ea07b78a601 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { find $out \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ - --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ + --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 90994ae708e50..1896a615ac1eb 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { find $out \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ - --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ + --set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 01ba759f4f697..aa009cb301a33 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -7,6 +7,8 @@ }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: +with { inherit (stdenv.lib) makeLibraryPath; }; + stdenv.mkDerivation rec { name = "android-sdk-${version}"; version = "24.4"; @@ -39,7 +41,7 @@ stdenv.mkDerivation rec { for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard do - patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i done @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { for i in emulator64-arm emulator64-mips emulator64-x86 do - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i done ''} @@ -58,7 +60,7 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/android \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]} wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ @@ -74,7 +76,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${file}/bin \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11_32bit libxcb_32bit libXau_32bit libXdmcp_32bit libXext_32bit mesa_32bit ]} done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' @@ -82,7 +84,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${file}/bin \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11 libxcb libXau libXdmcp libXext mesa alsaLib ]} done ''} ''} @@ -94,11 +96,11 @@ stdenv.mkDerivation rec { # The monitor requires some more patching cd lib/monitor-x86 - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor - patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor + patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} cd ../.. '' @@ -107,11 +109,11 @@ stdenv.mkDerivation rec { # The monitor requires some more patching cd lib/monitor-x86_64 - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor - patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor + patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib::${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} cd ../.. '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 2918acd8c15e8..1f4bf6e4cfdf6 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Patch the interpreter for i in aapt aidl bcc_compat dexdump llvm-rs-cc do - patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i done # These binaries need to find libstdc++ and libgcc_s @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # These binaries also need zlib in addition to libstdc++ for i in arm-linux-androideabi-ld i686-linux-android-ld mipsel-linux-android-ld split-select zipalign do - patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib:`pwd`/lib $i done diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 1243ba429a39a..1654b13d13b1a 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { '' for i in adb dmtracedump fastboot hprof-conv sqlite3 do - patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $i done diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index d22eeb6c21383..b33fc13224a39 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildPhase = '' ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux - ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so + ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index de800a295bcae..d392b5f789c1a 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { postPatch = '' substitute ${./META} META --subst-var-by VERSION "${version}" substituteInPlace Makefile \ - --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \ + --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \ --subst-var-by ZLIB_INCLUDE "${zlib}/include" ''; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index f56ec3cbed62e..a2cf545e84c58 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -7,11 +7,11 @@ in assert stdenv.lib.versionAtLeast ocaml_version "3.12"; stdenv.mkDerivation { - name = "cryptokit-1.9"; + name = "cryptokit-1.10"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1166/cryptokit-1.9.tar.gz; - sha256 = "1jh0jqiwkjy9qplnfcm5r25zdgyk36sxb0c87ks3rjj7khrw1a2n"; + url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; + sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; }; buildInputs = [zlib ocaml findlib ncurses]; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index f4837bd047f50..b6ee0d192e339 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace "unittest.ml" \ --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}" - substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat}/lib" \ - substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat}/include" \ + substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \ + substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ ''; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 20362a51a7be3..9314481cbcfe8 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -12,7 +12,7 @@ buildPerlPackage rec { cat > config.in <<EOF BUILD_ZLIB = False INCLUDE = ${zlib}/include - LIB = ${zlib}/lib + LIB = ${zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT EOF diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 985e7946b6b4a..13b633f4704eb 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -17,6 +17,10 @@ buildPerlPackage rec { ./external-sqlite.patch ]; + sqlite_dev = sqlite.dev; + sqlite_out = sqlite.out; + postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL"; + preBuild = '' substituteInPlace Makefile --replace -L/usr/lib "" diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch index 9a20fa2503997..1f90546b252c1 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch +++ b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch @@ -1,39 +1,33 @@ -diff -rc DBD-SQLite-1.29/Makefile.PL DBD-SQLite-1.29-new/Makefile.PL -*** DBD-SQLite-1.29/Makefile.PL 2010-01-08 10:08:29.000000000 +0100 ---- DBD-SQLite-1.29-new/Makefile.PL 2010-08-05 11:42:53.000000000 +0200 -*************** -*** 123,129 **** - # a system sqlite is also sophisticated enough to have a patching system - # that can change the if ( 0 ) to if ( 1 ) - my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); -! if ( 0 ) { - require File::Spec; - if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { - $sqlite_base =~ /=(.*)/; ---- 123,129 ---- - # a system sqlite is also sophisticated enough to have a patching system - # that can change the if ( 0 ) to if ( 1 ) - my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); -! if ( 1 ) { - require File::Spec; - if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { - $sqlite_base =~ /=(.*)/; -*************** -*** 184,191 **** - } else { - # Always the bundled one. - # XXX: ... and this message should be more informative. -! $sqlite_local = 1; -! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING}; - } - - @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV ); ---- 184,191 ---- - } else { - # Always the bundled one. - # XXX: ... and this message should be more informative. -! # $sqlite_local = 1; -! # print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING}; - } - - @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV ); +diff --git a/Makefile.PL b/Makefile.PL +index 606b28d..0cea060 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -128,24 +128,10 @@ SCOPE: { + # the system SQLite. We expect that anyone sophisticated enough to use + # a system sqlite is also sophisticated enough to have a patching system + # that can change the if ( 0 ) to if ( 1 ) +-my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); +-if ( 0 ) { +- require File::Spec; +- if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { +- $sqlite_base =~ /=(.*)/; +- $sqlite_base = $1; +- $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' ); +- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' ); +- } +- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) { +- $sqlite_local =~ /=(.*)/; +- $sqlite_local = "$1" ? 1 : 0; +- if ( $sqlite_local ) { +- # Keep these from making into CFLAGS/LDFLAGS +- undef $sqlite_lib; +- undef $sqlite_inc; +- } +- } ++my ($sqlite_local, $sqlite_lib, $sqlite_inc); ++if ( 1 ) { ++ $sqlite_lib = '@sqlite_out@/lib'; ++ $sqlite_inc = '@sqlite_dev@/include'; + + # Now check for a compatible sqlite3 + unless ( $sqlite_local ) { diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 7c51bf1b59179..9ee8be87c028d 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -28,6 +28,7 @@ preConfigure() { perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags } + postFixup() { # If a user installs a Perl package, she probably also wants its # dependencies in the user environment (since Perl modules don't diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 6cd4134cc9c41..91a004a7f686f 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,13 +1,15 @@ perl: -{ buildInputs ? [], ... } @ attrs: +{ buildInputs ? [], name, ... } @ attrs: perl.stdenv.mkDerivation ( { + outputs = [ "out" "docdev" ]; + doCheck = true; - + checkTarget = "test"; - + # Prevent CPAN downloads. PERL_AUTOINSTALL = "--skipdeps"; @@ -23,7 +25,7 @@ perl.stdenv.mkDerivation ( attrs // { - name = "perl-" + attrs.name; + name = "perl-" + name; builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; } diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch new file mode 100644 index 0000000000000..65e9d58a0ae49 --- /dev/null +++ b/pkgs/development/python-modules/cgkit/scons-env.patch @@ -0,0 +1,22 @@ +diff --git a/supportlib/SConstruct b/supportlib/SConstruct +index 7f797b9..07907e9 100644 +--- a/supportlib/SConstruct ++++ b/supportlib/SConstruct +@@ -5,7 +5,7 @@ + # library. + ###################################################################### + +-import sys, glob, os.path ++import sys, glob, os.path, os + + # Read the options + vars = Variables("cpp_config.cfg") +@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", []) + vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio") + + # Create the construction environment +-env = Environment(variables = vars) ++env = Environment(variables = vars, ENV = os.environ) + + # Build the files in "obj" + env.VariantDir("obj", "src", duplicate=0) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 321a0b49b0894..0928fa6ae7d1d 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -18,14 +18,17 @@ buildPythonPackage { # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found disabled = isPy3k; - patches = [ ./pygame-v4l.patch ]; + # Tests fail because of no audio device and display. + doCheck = false; - preConfigure = '' - for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do - sed -e "/origincdirs =/a'$i/include'," -i config_unix.py - sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py - done + patches = [ ./pygame-v4l.patch ]; + preConfigure = stdenv.lib.concatMapStrings (dep: '' + sed \ + -e "/origincdirs =/a'${dep.dev or dep.out}/include'," \ + -e "/origlibdirs =/aoriglibdirs += '${dep.lib or dep.out}/lib'," \ + -i config_unix.py + '') [ SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 ] + '' LOCALBASE=/ python config.py ''; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 6f71393304079..897210a4046c9 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "docdev" ]; configureFlags = "--disable-introspection"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 795019d0b411e..b11e87fe1d93c 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -27,6 +27,7 @@ in stdenv.mkDerivation { propagatedBuildInputs = [ sip ]; configurePhase = '' + runHook preConfigure mkdir -p $out lndir ${pythonDBus} $out @@ -44,6 +45,7 @@ in stdenv.mkDerivation { --destdir=$out/lib/${python.libPrefix}/site-packages \ --sipdir=$out/share/sip \ --designer-plugindir=$out/plugins/designer + runHook postConfigure ''; postInstall = '' diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix new file mode 100644 index 0000000000000..4519953ad5caa --- /dev/null +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -0,0 +1,904 @@ +# This file is generated from generate-r-packages.R. DO NOT EDIT. +# Execute the following command to update the file. +# +# Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix + +{ self, derive }: +let derive2 = derive { rVersion = "3.2"; }; +in with self; { + BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; }; + BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; }; + BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; }; + BSgenome_Amellifera_UCSC_apiMel2_masked = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2.masked"; version="1.3.99"; sha256="128jmpnpbz1afqvhvdc9vrc8gmlyg26ca7qz362qsx89jrm4khpr"; depends=[BSgenome BSgenome_Amellifera_UCSC_apiMel2]; }; + BSgenome_Athaliana_TAIR_04232008 = derive2 { name="BSgenome.Athaliana.TAIR.04232008"; version="1.3.1000"; sha256="0dsbjfh2yf0v3zmbypn9p3alvwhfw2qyr5vivyj7x9ablylb6qxc"; depends=[BSgenome]; }; + BSgenome_Athaliana_TAIR_TAIR9 = derive2 { name="BSgenome.Athaliana.TAIR.TAIR9"; version="1.3.1000"; sha256="0n45sn80c5nchfj1wzbcaicfyg66id2zhr5xm3w238idkbj05l00"; depends=[BSgenome]; }; + BSgenome_Btaurus_UCSC_bosTau3 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau3"; version="1.4.0"; sha256="0vh3664q7pynfw763pwg2h74h0ncmi5nslvj7y5bj1q7pvf03zpc"; depends=[BSgenome]; }; + BSgenome_Btaurus_UCSC_bosTau3_masked = derive2 { name="BSgenome.Btaurus.UCSC.bosTau3.masked"; version="1.3.99"; sha256="03l9xgbsfmrw3yk0hpza5gfhgd3cfflp5pqzi36ifnmpr40ca722"; depends=[BSgenome BSgenome_Btaurus_UCSC_bosTau3]; }; + BSgenome_Btaurus_UCSC_bosTau4 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau4"; version="1.4.0"; sha256="1z86qdpmilwrnjysn8qgxj3g7pqp9hwr25cpiabyczd216wy3zy5"; depends=[BSgenome]; }; + BSgenome_Btaurus_UCSC_bosTau4_masked = derive2 { name="BSgenome.Btaurus.UCSC.bosTau4.masked"; version="1.3.99"; sha256="0dkz9ixxa5x9l1v733a3sfrbnjd2kfmd5a2vxskkx9jm3hfbg6gr"; depends=[BSgenome BSgenome_Btaurus_UCSC_bosTau4]; }; + BSgenome_Btaurus_UCSC_bosTau6 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau6"; version="1.4.0"; sha256="0waaf9wfmdl5jbi3la64vsiqb83lyw9fqg3sn90bf1q7k3k617p3"; depends=[BSgenome]; }; + BSgenome_Btaurus_UCSC_bosTau6_masked = derive2 { name="BSgenome.Btaurus.UCSC.bosTau6.masked"; version="1.3.99"; sha256="07isv0lcvlsl0aha1p474l0pps0j7bsh455m33vfxwahivqsfy27"; depends=[BSgenome BSgenome_Btaurus_UCSC_bosTau6]; }; + BSgenome_Btaurus_UCSC_bosTau8 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau8"; version="1.4.2"; sha256="16wjy1aw9nvx03r7w8yh5w7sw3pn8i9nczd0n0728l6nnyqxlsz6"; depends=[BSgenome]; }; + BSgenome_Celegans_UCSC_ce10 = derive2 { name="BSgenome.Celegans.UCSC.ce10"; version="1.4.0"; sha256="1zaym97jk4npxk14ifvwz2rvhm4zx9xgs33r9vvx9rlynp0gydrk"; depends=[BSgenome]; }; + BSgenome_Celegans_UCSC_ce2 = derive2 { name="BSgenome.Celegans.UCSC.ce2"; version="1.4.0"; sha256="1x7nvisz7mjrpqlsiw4an04f8hksygzn96p5ld0388hljg78dax8"; depends=[BSgenome]; }; + BSgenome_Celegans_UCSC_ce6 = derive2 { name="BSgenome.Celegans.UCSC.ce6"; version="1.4.0"; sha256="0mqzb353xv2c3m3vkb315dkmnxkgczp7ndnknyhpgjlybyf715v9"; depends=[BSgenome]; }; + BSgenome_Cfamiliaris_UCSC_canFam2 = derive2 { name="BSgenome.Cfamiliaris.UCSC.canFam2"; version="1.4.0"; sha256="052p2lsm1ny0rjvhgd56w6z4nrqfc74vh0q7cmqz55xkhk01h7hm"; depends=[BSgenome]; }; + BSgenome_Cfamiliaris_UCSC_canFam2_masked = derive2 { name="BSgenome.Cfamiliaris.UCSC.canFam2.masked"; version="1.3.99"; sha256="14108j73z7959d070xiqar5s14pac18cs8a22lcggbmp5x93hmqz"; depends=[BSgenome BSgenome_Cfamiliaris_UCSC_canFam2]; }; + BSgenome_Cfamiliaris_UCSC_canFam3 = derive2 { name="BSgenome.Cfamiliaris.UCSC.canFam3"; version="1.4.0"; sha256="1ir092yh1h03ag1lnj2rh5hjp2mqrw7fcyb6mqyjm0h8g1pmpicr"; depends=[BSgenome]; }; + BSgenome_Cfamiliaris_UCSC_canFam3_masked = derive2 { name="BSgenome.Cfamiliaris.UCSC.canFam3.masked"; version="1.3.99"; sha256="07y28g6b4sbp38yg5rwldda7s1cwcpil6rzsb4csskvs0xi5286l"; depends=[BSgenome BSgenome_Cfamiliaris_UCSC_canFam3]; }; + BSgenome_Dmelanogaster_UCSC_dm2 = derive2 { name="BSgenome.Dmelanogaster.UCSC.dm2"; version="1.4.0"; sha256="1vnqbm1123zmpn1iwyygr1p4js0j6vifyz7iwzgkiw543yb1mwnl"; depends=[BSgenome]; }; + BSgenome_Dmelanogaster_UCSC_dm2_masked = derive2 { name="BSgenome.Dmelanogaster.UCSC.dm2.masked"; version="1.3.99"; sha256="1qclf62c3qrdhnrb6p4rhj7wrarlsbm716d37k0gbdzkfm2vhyr7"; depends=[BSgenome BSgenome_Dmelanogaster_UCSC_dm2]; }; + BSgenome_Dmelanogaster_UCSC_dm3 = derive2 { name="BSgenome.Dmelanogaster.UCSC.dm3"; version="1.4.0"; sha256="19bm3lkhhkag3gnwp419211fh0cnr0x6fa0r1lr0ycwrikxdxsv8"; depends=[BSgenome]; }; + BSgenome_Dmelanogaster_UCSC_dm3_masked = derive2 { name="BSgenome.Dmelanogaster.UCSC.dm3.masked"; version="1.3.99"; sha256="1756csb09f1br9rj1l3f08qyh4hlymdbd0cfn8x3fq39dn45m5ap"; depends=[BSgenome BSgenome_Dmelanogaster_UCSC_dm3]; }; + BSgenome_Dmelanogaster_UCSC_dm6 = derive2 { name="BSgenome.Dmelanogaster.UCSC.dm6"; version="1.4.1"; sha256="1bhj0rdgf7lspw4xby9y9mf7v7jxxz8001bc8vw8kf04rjsx6060"; depends=[BSgenome]; }; + BSgenome_Drerio_UCSC_danRer10 = derive2 { name="BSgenome.Drerio.UCSC.danRer10"; version="1.4.2"; sha256="1grlxihdx65fwgb9gbp1jibbqan9a5667w4jgswhg0qsia608lzs"; depends=[BSgenome]; }; + BSgenome_Drerio_UCSC_danRer5 = derive2 { name="BSgenome.Drerio.UCSC.danRer5"; version="1.4.0"; sha256="1mxmy4ika192xvlrsynyvnb7kvcvbsl89g39q53vrkibhml1q0v5"; depends=[BSgenome]; }; + BSgenome_Drerio_UCSC_danRer5_masked = derive2 { name="BSgenome.Drerio.UCSC.danRer5.masked"; version="1.3.99"; sha256="03y08jlknb52x37wg95xaf62n5fbsfpmx57bjyxz2gj0n8zhcdgv"; depends=[BSgenome BSgenome_Drerio_UCSC_danRer5]; }; + BSgenome_Drerio_UCSC_danRer6 = derive2 { name="BSgenome.Drerio.UCSC.danRer6"; version="1.4.0"; sha256="0h2chcpdi2vy29fg43r6q37vvb7p4d4cpnszlsmiy7ax358sd5ji"; depends=[BSgenome]; }; + BSgenome_Drerio_UCSC_danRer6_masked = derive2 { name="BSgenome.Drerio.UCSC.danRer6.masked"; version="1.3.99"; sha256="175gy5xfp5kzbgmagvls3233i925wppyk9alw75f7jnxfddxvq4k"; depends=[BSgenome BSgenome_Drerio_UCSC_danRer6]; }; + BSgenome_Drerio_UCSC_danRer7 = derive2 { name="BSgenome.Drerio.UCSC.danRer7"; version="1.4.0"; sha256="17x3hj08jag05y8q4aziy455jy15dpwkdbh97v3byzcda0kpwbpg"; depends=[BSgenome]; }; + BSgenome_Drerio_UCSC_danRer7_masked = derive2 { name="BSgenome.Drerio.UCSC.danRer7.masked"; version="1.3.99"; sha256="153cf2ni7xffi7j7dafg04v6i65gh8d21v7l9szm4c18bywvcn5z"; depends=[BSgenome BSgenome_Drerio_UCSC_danRer7]; }; + BSgenome_Ecoli_NCBI_20080805 = derive2 { name="BSgenome.Ecoli.NCBI.20080805"; version="1.3.1000"; sha256="1l7mjyys1kaq4mbia9jamyw6sd0ij1wypwxvwy8aksan3gcfnh27"; depends=[BSgenome]; }; + BSgenome_Gaculeatus_UCSC_gasAcu1 = derive2 { name="BSgenome.Gaculeatus.UCSC.gasAcu1"; version="1.4.0"; sha256="1w0jpv58kbjvjlsprn5g4nd3g6jhiyw3k6mlfnpnffcbdh27cq0k"; depends=[BSgenome]; }; + BSgenome_Gaculeatus_UCSC_gasAcu1_masked = derive2 { name="BSgenome.Gaculeatus.UCSC.gasAcu1.masked"; version="1.3.99"; sha256="13g2xc6v8qlrc0a0zly4ibhzgwg5dsrx1bmw4rrwnkk652alaivx"; depends=[BSgenome BSgenome_Gaculeatus_UCSC_gasAcu1]; }; + BSgenome_Ggallus_UCSC_galGal3 = derive2 { name="BSgenome.Ggallus.UCSC.galGal3"; version="1.4.0"; sha256="1bgw45nizdm1kq0624asr4ky61cm8pmrq32574phvvq1jjpg4isp"; depends=[BSgenome]; }; + BSgenome_Ggallus_UCSC_galGal3_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal3.masked"; version="1.3.99"; sha256="0igi02g46h1j87hv9bk45nbqahyjd0k75jkg0s6m9a62jsssg63l"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal3]; }; + BSgenome_Ggallus_UCSC_galGal4 = derive2 { name="BSgenome.Ggallus.UCSC.galGal4"; version="1.4.0"; sha256="1qfl046akdf43azigprc13sssgbmxdz9dmlrvy13ag8fgfkjxign"; depends=[BSgenome]; }; + BSgenome_Ggallus_UCSC_galGal4_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal4.masked"; version="1.3.99"; sha256="0fvqimjf1xvgka4nw66nd0rbyb7r93v8cyw33776lhfv68ny058v"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal4]; }; + BSgenome_Hsapiens_1000genomes_hs37d5 = derive2 { name="BSgenome.Hsapiens.1000genomes.hs37d5"; version="0.99.0"; sha256="0fnap8bxjn8xc38ihsbyi60q86cgvlznz9d1dl13q2ydb5bb1ryb"; depends=[BSgenome]; }; + BSgenome_Hsapiens_NCBI_GRCh38 = derive2 { name="BSgenome.Hsapiens.NCBI.GRCh38"; version="1.3.1000"; sha256="0y75qdq578fh6420vbvsbwmdw8jvr3g06qli2h3vj3pxmjykh9c1"; depends=[BSgenome]; }; + BSgenome_Hsapiens_UCSC_hg17 = derive2 { name="BSgenome.Hsapiens.UCSC.hg17"; version="1.3.1000"; sha256="1q8p0zp5xpp22znwnygl3jhc159db4q3kkpj5wfij5a6z19zs1w3"; depends=[BSgenome]; }; + BSgenome_Hsapiens_UCSC_hg17_masked = derive2 { name="BSgenome.Hsapiens.UCSC.hg17.masked"; version="1.3.99"; sha256="1pg39kmbmnync0xxdbgsn6gpz78hfbzd7iffidpv8mfk734srwzn"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg17]; }; + BSgenome_Hsapiens_UCSC_hg18 = derive2 { name="BSgenome.Hsapiens.UCSC.hg18"; version="1.3.1000"; sha256="1bd7hn4ksgpyhnbjb9qdqfz5cg6x5lsizbls55v9s9hnvfzq3yi6"; depends=[BSgenome]; }; + BSgenome_Hsapiens_UCSC_hg18_masked = derive2 { name="BSgenome.Hsapiens.UCSC.hg18.masked"; version="1.3.99"; sha256="031sr3y95c32igk3lrrsafdm9i1zprjran8gak06arqc0hvzbfk0"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg18]; }; + BSgenome_Hsapiens_UCSC_hg19 = derive2 { name="BSgenome.Hsapiens.UCSC.hg19"; version="1.4.0"; sha256="1y0nqpk8cw5a34sd9hmin3z4v7iqm6hf6l22cl81vlbxqbjibxc8"; depends=[BSgenome]; }; + BSgenome_Hsapiens_UCSC_hg19_masked = derive2 { name="BSgenome.Hsapiens.UCSC.hg19.masked"; version="1.3.99"; sha256="0452pyah0kv1vsrsjbrqw4k2rm8lc2vc771dzib45gnnfz86qxrr"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19]; }; + BSgenome_Hsapiens_UCSC_hg38 = derive2 { name="BSgenome.Hsapiens.UCSC.hg38"; version="1.4.1"; sha256="1ql08pvi4vv0ynvg4qs9kysw1c7s3crkgin6zxvgzqk6fray9mvi"; depends=[BSgenome]; }; + BSgenome_Hsapiens_UCSC_hg38_masked = derive2 { name="BSgenome.Hsapiens.UCSC.hg38.masked"; version="1.3.99"; sha256="0plfrhkwgpgp22mj5n704k4ml0vl6hs5wb5vzqnw3vr8qwv0bli1"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg38]; }; + BSgenome_Mfascicularis_NCBI_5_0 = derive2 { name="BSgenome.Mfascicularis.NCBI.5.0"; version="1.4.2"; sha256="1lrdj7aibx4i60hpbaqgk3qir9zjs67mxdgp5jmgmw7gf2nwyn3x"; depends=[BSgenome]; }; + BSgenome_Mfuro_UCSC_musFur1 = derive2 { name="BSgenome.Mfuro.UCSC.musFur1"; version="1.4.1"; sha256="0c0569a1k36sk0vzf7afhnfm0n2nwcdp3dc88s1hghpg7lwi9g9j"; depends=[BSgenome]; }; + BSgenome_Mmulatta_UCSC_rheMac2 = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac2"; version="1.4.0"; sha256="15vswd1fq7a7g1dkm0wzkmclih8z373nfzjyc3zrn9l0nawdv9jj"; depends=[BSgenome]; }; + BSgenome_Mmulatta_UCSC_rheMac2_masked = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac2.masked"; version="1.3.99"; sha256="1j4z4iy13n4qbi9a50qw1hn8z14xz0z8hbiwhy2bb9znykkf4chd"; depends=[BSgenome BSgenome_Mmulatta_UCSC_rheMac2]; }; + BSgenome_Mmulatta_UCSC_rheMac3 = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac3"; version="1.4.0"; sha256="0r3v4p567rxcczwqi7zdz7pmdiffgrq83j488libdb4s0hdg5jmi"; depends=[BSgenome]; }; + BSgenome_Mmulatta_UCSC_rheMac3_masked = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac3.masked"; version="1.3.99"; sha256="0k3j40hrys60qdij5rsxdzyx9bfmryaki5p7i4d5m0xmldlk9anr"; depends=[BSgenome BSgenome_Mmulatta_UCSC_rheMac3]; }; + BSgenome_Mmusculus_UCSC_mm10 = derive2 { name="BSgenome.Mmusculus.UCSC.mm10"; version="1.4.0"; sha256="12s0nm2na9brjad4rn9l7d3db2aj8qa1xvz0y1k7gk08wayb6bkf"; depends=[BSgenome]; }; + BSgenome_Mmusculus_UCSC_mm10_masked = derive2 { name="BSgenome.Mmusculus.UCSC.mm10.masked"; version="1.3.99"; sha256="12d7fkzh0b39b8f6qbgx07x5bmab91is4y846lp4zpbm3iya01g9"; depends=[BSgenome BSgenome_Mmusculus_UCSC_mm10]; }; + BSgenome_Mmusculus_UCSC_mm8 = derive2 { name="BSgenome.Mmusculus.UCSC.mm8"; version="1.4.0"; sha256="1al34aa11d6kr0cr4xrabix1xmqc96zzgik5p4yc8r0rba3n100a"; depends=[BSgenome]; }; + BSgenome_Mmusculus_UCSC_mm8_masked = derive2 { name="BSgenome.Mmusculus.UCSC.mm8.masked"; version="1.3.99"; sha256="1a2ywmy96cbwmvbdid73c0kln56qrbd7ipfzkzl97f56k3g985j5"; depends=[BSgenome BSgenome_Mmusculus_UCSC_mm8]; }; + BSgenome_Mmusculus_UCSC_mm9 = derive2 { name="BSgenome.Mmusculus.UCSC.mm9"; version="1.4.0"; sha256="1birqw30g2azimxpnjfzmkphan7x131yy8b9h85lfz5fjdg7841i"; depends=[BSgenome]; }; + BSgenome_Mmusculus_UCSC_mm9_masked = derive2 { name="BSgenome.Mmusculus.UCSC.mm9.masked"; version="1.3.99"; sha256="00bpbm3havqcxr4g63zhllsbpd9q6svgihks7qp7x73nm4gvq7fn"; depends=[BSgenome BSgenome_Mmusculus_UCSC_mm9]; }; + BSgenome_Osativa_MSU_MSU7 = derive2 { name="BSgenome.Osativa.MSU.MSU7"; version="0.99.1"; sha256="0da1xcxxgij04cf5gri43sprbbm9nq790phcfqcvc00mv7q78cpn"; depends=[BSgenome]; }; + BSgenome_Ptroglodytes_UCSC_panTro2 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro2"; version="1.4.0"; sha256="14yvajlldr3qhclg9n2j48q60rgbz6x1ypgzd6dgf4c6jxl90p0q"; depends=[BSgenome]; }; + BSgenome_Ptroglodytes_UCSC_panTro2_masked = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro2.masked"; version="1.3.99"; sha256="1dy1bf6rsmzv6qj9d2a1sz56w33pk63g3qxm8znfdw11hmdbq9m1"; depends=[BSgenome BSgenome_Ptroglodytes_UCSC_panTro2]; }; + BSgenome_Ptroglodytes_UCSC_panTro3 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3"; version="1.4.0"; sha256="1vbfx0zrj4rcwcsm1q09xdiv0mmrycj8223lnxqb8nr5r017f7gm"; depends=[BSgenome]; }; + BSgenome_Ptroglodytes_UCSC_panTro3_masked = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3.masked"; version="1.3.99"; sha256="18ga0whdcp5zpigrmh68wjmn99lzvfyvgxjm58y0jx66rmg94mir"; depends=[BSgenome BSgenome_Ptroglodytes_UCSC_panTro3]; }; + BSgenome_Rnorvegicus_UCSC_rn4 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4"; version="1.4.0"; sha256="1aww2bxyqbb81iln3vgrb0659r82v9yv1z41k9r3zws8b7k7df6x"; depends=[BSgenome]; }; + BSgenome_Rnorvegicus_UCSC_rn4_masked = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4.masked"; version="1.3.99"; sha256="0jfv1873ab1nwwdr18vrjqcdl4rhv3xgqbf4jfnjk7sjx154pfi6"; depends=[BSgenome BSgenome_Rnorvegicus_UCSC_rn4]; }; + BSgenome_Rnorvegicus_UCSC_rn5 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn5"; version="1.4.0"; sha256="1s92983m73bi08ihvyd8c17yx29hz5xxrnrs2if8fda4asw1f3f0"; depends=[BSgenome]; }; + BSgenome_Rnorvegicus_UCSC_rn5_masked = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn5.masked"; version="1.3.99"; sha256="0ss14nlr6gqs414ckcz4zmyhfrwdp2snw9wh48yk4s8r4ij3z9rj"; depends=[BSgenome BSgenome_Rnorvegicus_UCSC_rn5]; }; + BSgenome_Rnorvegicus_UCSC_rn6 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn6"; version="1.4.1"; sha256="1lyvf7l5vyrsmjhn5kz0lrj784hd0b0bcrwb4lavd3p5g38b3mmm"; depends=[BSgenome]; }; + BSgenome_Scerevisiae_UCSC_sacCer1 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer1"; version="1.4.0"; sha256="1smx3zdmllrx5f1a7hv1w3jc59jwvkd2n37hz6hgb80da7lajn2b"; depends=[BSgenome]; }; + BSgenome_Scerevisiae_UCSC_sacCer2 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer2"; version="1.4.0"; sha256="1ilz326qx1ikapmsz00hg5g6i637qm9kwc21z93q890h7sgaz4k0"; depends=[BSgenome]; }; + BSgenome_Scerevisiae_UCSC_sacCer3 = derive2 { name="BSgenome.Scerevisiae.UCSC.sacCer3"; version="1.4.0"; sha256="1pnd394xfy413nvxq3hrlv33girj8f9kzdzi9gx232lm12av6hxm"; depends=[BSgenome]; }; + BSgenome_Sscrofa_UCSC_susScr3 = derive2 { name="BSgenome.Sscrofa.UCSC.susScr3"; version="1.4.0"; sha256="0l70arnpshiviq3xj61fw87dhf8sggq6k1yryagbhdb40d5cq8lq"; depends=[BSgenome]; }; + BSgenome_Sscrofa_UCSC_susScr3_masked = derive2 { name="BSgenome.Sscrofa.UCSC.susScr3.masked"; version="1.3.99"; sha256="0ym82vysn131anp8zmmkgyx6zmyh44am5i1m3j9kj5lvq874ycha"; depends=[BSgenome BSgenome_Sscrofa_UCSC_susScr3]; }; + BSgenome_Tgondii_ToxoDB_7_0 = derive2 { name="BSgenome.Tgondii.ToxoDB.7.0"; version="0.99.0"; sha256="1ilpfd66hn0qh1dkj9l8wkddym9d320blwj5hx0x7dq92bnzs98v"; depends=[BSgenome]; }; + BSgenome_Tguttata_UCSC_taeGut1 = derive2 { name="BSgenome.Tguttata.UCSC.taeGut1"; version="1.4.0"; sha256="0v8g4q64pj4mxr8wzyxm9w2d2lyzq1qzl5yvh2dvwpqnghicj10v"; depends=[BSgenome]; }; + BSgenome_Tguttata_UCSC_taeGut1_masked = derive2 { name="BSgenome.Tguttata.UCSC.taeGut1.masked"; version="1.3.99"; sha256="05g9qp2vkp8ia6kqgy07ihnr1w1ca8c96rg7vfahh2nsr5j6ymba"; depends=[BSgenome BSgenome_Tguttata_UCSC_taeGut1]; }; + BSgenome_Tguttata_UCSC_taeGut2 = derive2 { name="BSgenome.Tguttata.UCSC.taeGut2"; version="1.4.2"; sha256="1ikbd5q77l2zmbmbm511s41h00627zi0gq31cm4qr3k1cvlz8617"; depends=[BSgenome]; }; + BSgenome_Vvinifera_URGI_IGGP12Xv0 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv0"; version="0.1"; sha256="1m8mqkiqs7291hccb8pfyf2yxpky45qr6j3d9wkvp9x3ra3h0yxf"; depends=[BSgenome]; }; + BSgenome_Vvinifera_URGI_IGGP12Xv2 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv2"; version="0.1"; sha256="1saavsi75gw33jphhm3qb5psyfrv850ss4cmqr4i7aw1kc0fvs1j"; depends=[BSgenome]; }; + ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="0.99.3"; sha256="0m060izffk98p3jyv2k534nmz1labr69z9f8ns59pkwkwvjr00f8"; depends=[BiocGenerics ChemmineR RSQLite]; }; + DO_db = derive2 { name="DO.db"; version="2.9"; sha256="10bqqa124l61ivzy4mdd3z3ar9a6537qbxw23pc4y9w8a6dwnavn"; depends=[AnnotationDbi]; }; + EnsDb_Hsapiens_v75 = derive2 { name="EnsDb.Hsapiens.v75"; version="0.99.12"; sha256="1yc912m6qvrqbmc9y4bxyr1l3vfq4pv751jagsqpvjlhgkdasn2p"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Hsapiens_v79 = derive2 { name="EnsDb.Hsapiens.v79"; version="0.99.12"; sha256="1r09wksknhsa42aq2xdwnyd0agsw46fnxijb5nkx1avhp82zlpp2"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Mmusculus_v75 = derive2 { name="EnsDb.Mmusculus.v75"; version="0.99.12"; sha256="1w3hby778gm1xcin2jyjn6f9l4h2na7lz99mqy28pl6g2b2fc74g"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Mmusculus_v79 = derive2 { name="EnsDb.Mmusculus.v79"; version="0.99.12"; sha256="0zhjh0l26rsimg2qz9a7qgxcb7h4mrgp28wawh7993mym6apwbvq"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Rnorvegicus_v75 = derive2 { name="EnsDb.Rnorvegicus.v75"; version="0.99.12"; sha256="11g24pbal3frfkfndcs80kmbp9igkf7l8hqfbz1ggdxyshgaf6z0"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Rnorvegicus_v79 = derive2 { name="EnsDb.Rnorvegicus.v79"; version="0.99.12"; sha256="1s0mbrd3v104rxvnjrm7rq21ypy5vcjgbhnadwkj679spz84jnib"; depends=[ensembldb GenomicFeatures]; }; + FDb_FANTOM4_promoters_hg19 = derive2 { name="FDb.FANTOM4.promoters.hg19"; version="1.0.0"; sha256="04sn5x1r5fcbghzw6n1bvy0z8zyhrbk86wsqz1p5gk665vicz8rw"; depends=[AnnotationDbi Biostrings GenomicFeatures]; }; + FDb_InfiniumMethylation_hg18 = derive2 { name="FDb.InfiniumMethylation.hg18"; version="2.2.0"; sha256="0vwzqzj49imjdsn8ssiwqi7qic7rqw5pbsiinyxgy7y10fn2i42a"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg18_knownGene]; }; + FDb_InfiniumMethylation_hg19 = derive2 { name="FDb.InfiniumMethylation.hg19"; version="2.2.0"; sha256="0gq90fvph6kgrpjb89nvzq6hl1k24swn19rgjh5g98l86mja6nk0"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + FDb_UCSC_snp135common_hg19 = derive2 { name="FDb.UCSC.snp135common.hg19"; version="1.0.0"; sha256="1ykyixrbw86ajx65w1jwr068ma5cvzl4kypaw77kpggmf1qqgkxp"; depends=[AnnotationDbi GenomicFeatures]; }; + FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; }; + FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; }; + GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; }; + GO_db = derive2 { name="GO.db"; version="3.2.2"; sha256="00gariag9ampz82dh0xllrc26r85d7vdcwc0vca5zdy147rwxr7f"; depends=[AnnotationDbi]; }; + Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.2"; sha256="08m39vdmb0d93wlsianfnc284z0594szbjf68idazjnki7iy6mg4"; depends=[AnnotationDbi org_Hs_eg_db]; }; + HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.2"; sha256="1hmnnjzh13jxvsbf7kzc01kzf527qpywr20q9j2smpljqva34jgj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + Hspec = derive2 { name="Hspec"; version="0.99.1"; sha256="18paxil1976g7c7zyh02wxqj55ndbnshl27z0jhlzc2dwzagx7mb"; depends=[AnnotationDbi]; }; + HuExExonProbesetLocation = derive2 { name="HuExExonProbesetLocation"; version="1.15.0"; sha256="0rpn9wh97gh9h795krfqnydxnliqnwgvp33xwqa4g8px3c34nmw1"; depends=[AnnotationDbi]; }; + HuExExonProbesetLocationHg18 = derive2 { name="HuExExonProbesetLocationHg18"; version="0.0.2"; sha256="14lbmcb0166rgv25d24g7kng5nvddynvmszfk5mq1yl1spbh7j9g"; depends=[AnnotationDbi]; }; + HuExExonProbesetLocationHg19 = derive2 { name="HuExExonProbesetLocationHg19"; version="0.0.3"; sha256="0h240v2wc2c935bxws6xpha4c0hw89bm821w1c1digwhd04kbyxh"; depends=[AnnotationDbi]; }; + HuO22_db = derive2 { name="HuO22.db"; version="3.2.2"; sha256="06vk5i3l3204gznafkrfxxgbm448bxnigjwfk3z3pz7a4097nf2p"; depends=[AnnotationDbi org_Hs_eg_db]; }; + IlluminaHumanMethylation27k_db = derive2 { name="IlluminaHumanMethylation27k.db"; version="1.4.8"; sha256="0zw0n4a9v42ifmvw2hfzzvl8jz1d7f00ia59ljhcvvw9aj12q4zs"; depends=[AnnotationDbi org_Hs_eg_db]; }; + IlluminaHumanMethylation27kmanifest = derive2 { name="IlluminaHumanMethylation27kmanifest"; version="0.4.0"; sha256="1kvz6z7g61zdrc1i93wsk1zv5mwcswfkxkl114644q09djwbz1fx"; depends=[minfi]; }; + IlluminaHumanMethylation450k_db = derive2 { name="IlluminaHumanMethylation450k.db"; version="2.0.9"; sha256="1zmm65qnm95w9c8z30c9vncca451npbhhnlkpkpp894svsakxziz"; depends=[AnnotationDbi org_Hs_eg_db]; }; + IlluminaHumanMethylation450kanno_ilmn12_hg19 = derive2 { name="IlluminaHumanMethylation450kanno.ilmn12.hg19"; version="0.2.1"; sha256="1agvivsji3ppd9qwmf99kzyg5jrz1wnz3f0w07715xywc6pavvxl"; depends=[minfi]; }; + IlluminaHumanMethylation450kmanifest = derive2 { name="IlluminaHumanMethylation450kmanifest"; version="0.4.0"; sha256="0qx75xwifrbkqmbkd8dhf44c34ibmbivqh7y8rvgrsizmi5ybcj1"; depends=[minfi]; }; + IlluminaHumanMethylation450kprobe = derive2 { name="IlluminaHumanMethylation450kprobe"; version="2.0.6"; sha256="1iah0rw7d8qvgwvn6n2l4cln39ky010gqpd9shml45m48m6whiia"; depends=[AnnotationDbi]; }; + JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.2"; sha256="08fvzg8zs0yyxqnjxbgqxfgphgyfm2yr21g1s414lkjixv16s6hd"; depends=[AnnotationDbi org_Hs_eg_db]; }; + KEGG_db = derive2 { name="KEGG.db"; version="3.2.2"; sha256="074dn5fy8b8p6mwb2l058sn9a3vy2j8isc5fv9vnmn0p9h0aqhi4"; depends=[AnnotationDbi]; }; + LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.2"; sha256="1pqgdgzqjfw96n8d8fwql6jg6gp407xca29jwmcyv4g59v1bx81d"; depends=[AnnotationDbi org_Hs_eg_db]; }; + LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; }; + MafDb_ALL_wgs_phase1_release_v3_20101123 = derive2 { name="MafDb.ALL.wgs.phase1.release.v3.20101123"; version="3.2.0"; sha256="1zd2hpp9f4ilajsx6xpimgiqzkxhc3lyhanr4n4gv0d3cdkxa1mb"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MafDb_ALL_wgs_phase3_release_v5a_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5a.20130502"; version="3.2.0"; sha256="06bdbrjqh0gc7sypp94v0bwq4cfbz8vnq6z3g36w8906ziss6a8j"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MafDb_ALL_wgs_phase3_release_v5b_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5b.20130502"; version="3.2.0"; sha256="1cc2aphc98nip100jfxy39clknrnpn5z838f1b8fb542whypikn7"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.2.0"; sha256="1dykp9bz1srb144yimkyagfhigr5dzg8ybxa5fsn3sr99p31va69"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MafDb_ExAC_r0_3_sites = derive2 { name="MafDb.ExAC.r0.3.sites"; version="3.2.0"; sha256="1qb3zwlkqaw2p5faajjahpp6g8wp02gd733kw9kim9xddjvjba14"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.5.0"; sha256="07mcj2lrrgnazzk4kgnzriyrny6mv1n0bpyi2s4vkv58xxm2n04k"; depends=[MeSHDbi]; }; + MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.5.0"; sha256="0jp07lnlxmb05cs0j3zr4spnlnqbh846j08ic7nhcl1bgzh652dp"; depends=[MeSHDbi]; }; + MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.5.0"; sha256="0rf2sr7sv2vpszi5wssznx25crx1ad4nbjj3w9whvhn2bzprksw3"; depends=[MeSHDbi]; }; + MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.5.0"; sha256="0ggh4r8vrah8ln14hhvn3rxcv8xxjv8g72pw4l6rrxcwqbicy2pq"; depends=[MeSHDbi]; }; + MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.5.0"; sha256="1x6rap57yzshli4vx4ljv3n8pmrd4xy3lblcpl4nd3319hnl9nfy"; depends=[MeSHDbi]; }; + MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.5.0"; sha256="0iz8aq9sxy485csm3fib3p5mvsnv81kq5d6a1jsnqqhh629c6pf3"; depends=[MeSHDbi]; }; + MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.5.0"; sha256="0dqnnmm668ahychvksbfsk21v7p51ac3qz8n9nff608z8nrry67p"; depends=[MeSHDbi]; }; + MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.5.0"; sha256="0qka863lgsbyv4xny6h1d9xjgckyvbzw4hrd59ykk5j6bjar3zvq"; depends=[MeSHDbi]; }; + MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.5.0"; sha256="0wbrqgxqzvv7s1ak4axkh5x7wl0wlgl9zds2xm1675w5li40j6dv"; depends=[MeSHDbi]; }; + MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.5.0"; sha256="0va8mqhxq7r02bjyi2pyr0y4zhl6jn8lq8367qbzs4bfbj7y2w44"; depends=[MeSHDbi]; }; + MeSH_Bsu_TUB10_eg_db = derive2 { name="MeSH.Bsu.TUB10.eg.db"; version="1.5.0"; sha256="1igsl86sgwmxwy4j1igp5a355rff4jm9pia1hv59s9c6nni5xdfc"; depends=[MeSHDbi]; }; + MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.5.0"; sha256="1v8vmyhdw625s9gl6wfrfbq653mxjhsxayjgm0m9m0h3rkw6nadw"; depends=[MeSHDbi]; }; + MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.5.0"; sha256="03lxs5hkbfqw6wdgdsdspblj6a7pwyqny8ypw72rl6gs0m1jha25"; depends=[MeSHDbi]; }; + MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.5.0"; sha256="1jfn1qdx7dzqi5hwgcz02g5sc0wnqmgc1rm0n3d6mapzz286jl3q"; depends=[MeSHDbi]; }; + MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.5.0"; sha256="171243fbgalpa5fjfqprj8gvg04wrcn1x8l465mzw8jj4y58pc60"; depends=[MeSHDbi]; }; + MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.5.0"; sha256="1gcnrynfnjapwdk13xk2x5g2jphk16ycp04qhwxp2qn53pgrj15k"; depends=[MeSHDbi]; }; + MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.5.0"; sha256="0fdfslzh69rln2yj8hvb0igg3hmvn58pmkzfg0wpr3cc2y51jjvq"; depends=[MeSHDbi]; }; + MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.5.0"; sha256="0m1z665crgj2q00bcz9m9gb0i55fca19agfpdd1b3nyiqil5fwqs"; depends=[MeSHDbi]; }; + MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.5.0"; sha256="1xxlvi78mwjgqigrbxg0zas39i6j9c8ih6yh2s1xvmfm9mdg8v0j"; depends=[MeSHDbi]; }; + MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.5.0"; sha256="0s8w895f3l43v68s5wipggk4lq31cxsvlz7p6rfplj3chqkb4z2c"; depends=[MeSHDbi]; }; + MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.5.0"; sha256="0ra8hqg6w6w8w5wib4qa3py6bk961v47bmr47c9f5zbmp2n4ghwn"; depends=[MeSHDbi]; }; + MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.5.0"; sha256="0y1hcpbf3ddby76i19x933l4hz92a6v03k1cpyqipf1x8gdlkm1z"; depends=[MeSHDbi]; }; + MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.5.0"; sha256="1dlnxpp0ad5n0k43sy3jaz8ak9qxrmy57zg5bsxp65c04fgr3j9j"; depends=[MeSHDbi]; }; + MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.5.0"; sha256="0zllh66mbh20z402wv31993g06q4ap41f5fc7karkf17fbxz7nsl"; depends=[MeSHDbi]; }; + MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.5.0"; sha256="1lhqac659i3hys4r90r5y9k5m48r6ai2f3kir5v2046b8y5gbdx9"; depends=[MeSHDbi]; }; + MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.5.0"; sha256="03fq4zj3d8ag5k05g9jvfll99dir9cnl04lkaw9n3h0q28hrsjg2"; depends=[MeSHDbi]; }; + MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.5.0"; sha256="0zh1awvf8v4axzqhazf8rqb8srp8sas3raiackw2z1niq89l0jw9"; depends=[MeSHDbi]; }; + MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.5.0"; sha256="0myhby94b2i2sp4fzm5wa7j102admbp3lkdzyjwwbq6sw7hznb47"; depends=[MeSHDbi]; }; + MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.5.0"; sha256="1bxrfqh2pwkxdqs9vzvcwh5k1whik45bsmnbkr5c9yaryz8g801y"; depends=[MeSHDbi]; }; + MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.5.0"; sha256="0qp2zqm2z998sx3gzkam0h5f38bblkvwb0jsvxckdr1n7j0ld3bz"; depends=[MeSHDbi]; }; + MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.5.0"; sha256="0l675bqgmk455jx2iwzc3rn3v3a125grc0w6g1j25agbar8fznln"; depends=[MeSHDbi]; }; + MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.5.0"; sha256="190rfd5y5rrjphsc0dhnsms4bx2dkzs8m2ljv5rj1ygwhx78smz6"; depends=[MeSHDbi]; }; + MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.5.0"; sha256="1ci0s1hklzaxc5h0wbfx21llqawi5n9bl0fddpiwwqma8mpy07k5"; depends=[MeSHDbi]; }; + MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.4.0"; sha256="1r9q1vk8p9ah28k6gc2dlglwyi1i0y5zaxmzcrkxyw04pfzn41f7"; depends=[MeSHDbi]; }; + MeSH_Eco_CFT073_eg_db = derive2 { name="MeSH.Eco.CFT073.eg.db"; version="1.4.0"; sha256="0r7hlxd5k9n9shq3wj5ldqj00apvx4bv8h38v2i4adv29s5x7973"; depends=[MeSHDbi]; }; + MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.5.0"; sha256="0qaciqrisxq7nhib661ha3ixwl2gpc3040dxiw7n4hy87bxa17g4"; depends=[MeSHDbi]; }; + MeSH_Eco_HS_eg_db = derive2 { name="MeSH.Eco.HS.eg.db"; version="1.4.0"; sha256="0gyrfjyp3k5jbcg92qzz4fjpmk9m4i0v7q2yvja73sni6976g9ca"; depends=[MeSHDbi]; }; + MeSH_Eco_IAI1_eg_db = derive2 { name="MeSH.Eco.IAI1.eg.db"; version="1.4.0"; sha256="16mxh182ij25qgfk14dzzpvaac7fqcnzx58j5m6hfrz3wvgh9jrq"; depends=[MeSHDbi]; }; + MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.5.0"; sha256="0cgyb709k0894m5f8gzsfx0215mf058dwmpi41rm4xbv98ww9x2p"; depends=[MeSHDbi]; }; + MeSH_Eco_K12_DH10B_eg_db = derive2 { name="MeSH.Eco.K12.DH10B.eg.db"; version="1.4.0"; sha256="00y5qlqrsjl941iaqln4m5jvskc2a6kildys881ml92f14cmgs07"; depends=[MeSHDbi]; }; + MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.5.0"; sha256="1az1si0pkd9jngddvd5b37k0h5y5p2mkis9z1y6w9g3kp2z5b3wy"; depends=[MeSHDbi]; }; + MeSH_Eco_O127_H6_E2348_69_eg_db = derive2 { name="MeSH.Eco.O127.H6.E2348.69.eg.db"; version="1.4.0"; sha256="1as23bz0yylgf24sy84xm46bblvkacp84kjr2g8c9if1vll2x2dg"; depends=[MeSHDbi]; }; + MeSH_Eco_O157_H7_EDL933_eg_db = derive2 { name="MeSH.Eco.O157.H7.EDL933.eg.db"; version="1.4.0"; sha256="0qnnp2a2v3nv1br1lg2km0p96q1knwa1fx95cg4wp38nc5g0jcc9"; depends=[MeSHDbi]; }; + MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.5.0"; sha256="12x6fp6h45ixxisib2x16rvx5xv57xfh9pcrwpprrj8sy2pv2gbb"; depends=[MeSHDbi]; }; + MeSH_Eco_S88_eg_db = derive2 { name="MeSH.Eco.S88.eg.db"; version="1.4.0"; sha256="15k44ricv7vi7sbw5s2nckm6jwbfzrrjp8ck06ydjp9q70hfzmhy"; depends=[MeSHDbi]; }; + MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.5.0"; sha256="1a6f5xz5zc609k27fivaav5dg9kmz9wyrmjm4cz194ac36zj57q7"; depends=[MeSHDbi]; }; + MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.5.0"; sha256="02lp2sdgbz8a50l0s8mfw7halgdg2sc00sxc6k2dr7his3clhnby"; depends=[MeSHDbi]; }; + MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.5.0"; sha256="1i8vlkis021cw5ym0f74rgpcml8x8wcsjvaynpadpvfkyra49946"; depends=[MeSHDbi]; }; + MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.5.0"; sha256="1awwmbmrgi5jpsa6xys4aqd8c4vjcfy0d1fbs918v8dha9ksy202"; depends=[MeSHDbi]; }; + MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.5.0"; sha256="13cpchm3lyc259r739k1kcljmjpr31l7wp9zgiliyqc1l7hw279k"; depends=[MeSHDbi]; }; + MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.5.0"; sha256="09sbzwqh1bi0bbdxbin107nbqw9vch09vsr2d2pq3z5q3bdz52sh"; depends=[MeSHDbi]; }; + MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.5.0"; sha256="0f71ywvjsc2ly8l7lrxm6nrkrnm2vlkbmnm0bi22yqwvr5q5gm4q"; depends=[MeSHDbi]; }; + MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.5.0"; sha256="1l3yfi4vx3yzw8i85ymy0fj1k1q66gyv4fjl5mbq5nlz8g6r19y0"; depends=[MeSHDbi]; }; + MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.5.0"; sha256="01mr5crin0ak57gdm1p36m3066a2x2m81g74minf2ijghpnb67q5"; depends=[MeSHDbi]; }; + MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.5.0"; sha256="0icm9jnyi46bp5knsxmb1fv2fghimrmwskq9p5yzgm1jhr43qgjd"; depends=[MeSHDbi]; }; + MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.5.0"; sha256="0d3y2837n0k74mn2bv75x3f3bm1xlzfh728221vfhyj9xzbs6131"; depends=[MeSHDbi]; }; + MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.5.0"; sha256="04ba79mky8m6wiiwi0fkcz9c6gfk1c81pypz77258qwbi98p6y32"; depends=[MeSHDbi]; }; + MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.5.0"; sha256="0ligmwg9f6qs99ngnk81imlp6n48cw5jjnqklaw8dcy8ph016vhf"; depends=[MeSHDbi]; }; + MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.5.0"; sha256="187bw5svsbssyjm3rdy9lh5wp5r0wkspxska80hqf26swbjl4ymm"; depends=[MeSHDbi]; }; + MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.5.0"; sha256="1gairkwy29jg949i270ndzsa6f9zwcs7i61lj6w26piz6hcjgv28"; depends=[MeSHDbi]; }; + MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.5.0"; sha256="1wk2mfd1qg1ycfqsd0v5zp470cb49vczsarar8wfkly5mvl561m4"; depends=[MeSHDbi]; }; + MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.5.0"; sha256="12xkw4s3ycr9fpz2q36rcg3mhvzplmg8fmigcigd5vg0g5029wi8"; depends=[MeSHDbi]; }; + MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.5.0"; sha256="0jwrkhdfykm71cn1smzzp5wjph04v687lvk0hyazd1hb5wwhwkyi"; depends=[MeSHDbi]; }; + MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.5.0"; sha256="105qz16b2l2sbr1r8if3bkc6w0cll7lhg67j09l8a9y9f4ddwa65"; depends=[MeSHDbi]; }; + MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.5.0"; sha256="03hrggzl4j29k9fvvhzhbil506k02lmnpl3rm63m3x35416g7wsj"; depends=[MeSHDbi]; }; + MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.5.0"; sha256="0kd4cz233y4kld8gb3qhnv5bjm9jpfngkc5d6y4bk91jkq1d4g3a"; depends=[MeSHDbi]; }; + MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.5.0"; sha256="0cm5ja8l1mkvzpv68gg4aimy68kxzpppps50iwhxc191h2dxkl4r"; depends=[MeSHDbi]; }; + MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.5.0"; sha256="1l793h8x3bhm8nydxf517gi8b9paf0plw6i3kmi84gwczvywffqq"; depends=[MeSHDbi]; }; + MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.5.0"; sha256="1g131cjhlxjppvrjdcl1rwz8856f110a467lyp1kk0pvd2d0xhvz"; depends=[MeSHDbi]; }; + MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.5.0"; sha256="0z7ypnmi68spzr4dv98lswj5wna0rwnwvmbw1g6ihi25vd26cd37"; depends=[MeSHDbi]; }; + MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.5.0"; sha256="1hzwrc6l41psr1f3zjm71b87rf5bjzwskkanfv1rx87ynq1h2m81"; depends=[MeSHDbi]; }; + MeSH_Sau_USA300TCH1516_eg_db = derive2 { name="MeSH.Sau.USA300TCH1516.eg.db"; version="1.4.0"; sha256="109kvsdqvra8x392l82djbd46l8z4hv4z92785ivgdcnchsdjq7p"; depends=[MeSHDbi]; }; + MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.5.0"; sha256="07xvrvhyb0gfq2fx47prkcax46csrb3c2rmvik6lbm17h0ah55x4"; depends=[MeSHDbi]; }; + MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.5.0"; sha256="0y9afs85yqgyz9701fpwkz3y3wabwks56m1ar3qv8zap6s124fh7"; depends=[MeSHDbi]; }; + MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.5.0"; sha256="02p6g63rcfnx6db91njw33qrzbr4nra9ddwbwg23jz1vhqlxcv5a"; depends=[MeSHDbi]; }; + MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.5.0"; sha256="083pg2bc56s52rkv7mvbziq0hjrfndwja32jd31pxdd0cjdv3c3q"; depends=[MeSHDbi]; }; + MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.5.0"; sha256="1vx6h5pv7hygmgrd5wjdcx576bvr23xfhh4aba3a2jzsjwvg0c9c"; depends=[MeSHDbi]; }; + MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.5.0"; sha256="0c8ijwz4vcwcbf18jsf2z3wxis09h9wrsb9fki5wspgjc486lz9n"; depends=[MeSHDbi]; }; + MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.5.0"; sha256="03sd73jipya5zqdzqxd6iwnmwmxkqp1mz9hg2bzmfnx3jz3fd5sv"; depends=[MeSHDbi]; }; + MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.5.0"; sha256="05fandy9ig1arahaag0wa09gwz8g4g7bpyns0jchmw88044jvgqs"; depends=[MeSHDbi]; }; + MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.5.0"; sha256="03bysvpymrq4n4xa48hksm9vayww6gvjpncnb4q5891azja3drpr"; depends=[MeSHDbi]; }; + MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.5.0"; sha256="0vdxabqli7z2cpdq015jhaddzsxh23k7x0pzc28k8aqbp84czb89"; depends=[MeSHDbi]; }; + MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.5.0"; sha256="0cyn8lflhb8n4fkh7sm0ky9q5n640cwxks22a54x16bvr7bb7f1k"; depends=[MeSHDbi]; }; + MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.5.0"; sha256="04ihvbp7dlb4fb68snlq0imh3igfhacjsqjnjnwnm1xqgynzn6f6"; depends=[MeSHDbi]; }; + MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.5.0"; sha256="09g6wh866n2xbdy4xmglbk361zwiyywgxwbzndm8yd1xdkzc4myw"; depends=[MeSHDbi]; }; + MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.5.0"; sha256="00vm12fgmlw79bpkfbc4yrwvf8c6daw3fkxysag6qpjfsjrbdhlg"; depends=[MeSHDbi]; }; + MeSH_db = derive2 { name="MeSH.db"; version="1.5.0"; sha256="1r6iyc1066g7bgil9d0dk5s23bz3bv7idn7k18kbgzm2j3dm9m5g"; depends=[MeSHDbi]; }; + MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.2"; sha256="0zynbckkdxwd90v4k2gv7cmwg0m80jqq5khrzxb73jf7bqn85d3n"; depends=[AnnotationDbi org_Mm_eg_db]; }; + MoExExonProbesetLocation = derive2 { name="MoExExonProbesetLocation"; version="1.15.0"; sha256="0bvj3bji4bwwmxjz4b57n1aqypdibdmry30rfwmlxss1hav96sl7"; depends=[AnnotationDbi]; }; + Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.2"; sha256="0k6y8kk3xa0j76l23y8zh31xa6dvwq70b1akwzxlv4nikxdzc1m1"; depends=[AnnotationDbi org_Mm_eg_db]; }; + Mu22v3_db = derive2 { name="Mu22v3.db"; version="3.2.2"; sha256="0576rrlbh5ikik3wqrz83m3ah9dwmqi14fb52wjr31rrbw72qza6"; depends=[AnnotationDbi org_Mm_eg_db]; }; + Mus_musculus = derive2 { name="Mus.musculus"; version="1.3.1"; sha256="143zdf83gbfqhy8jm9df7gzhw5q3a64jrjrxrzjf0zd76j8s8j6y"; depends=[AnnotationDbi GenomicFeatures GO_db org_Mm_eg_db OrganismDbi TxDb_Mmusculus_UCSC_mm10_knownGene]; }; + Norway981_db = derive2 { name="Norway981.db"; version="3.2.2"; sha256="16wn65n0yydba5mji4ysxwipl263kz2sv6zkj16i8ri5zvnk5343"; depends=[AnnotationDbi org_Hs_eg_db]; }; + OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.2"; sha256="0h7pcpkz9fmqfam00a57g0dkwmmgd9fh54yz12hl23g2nhydswac"; depends=[AnnotationDbi org_Hs_eg_db]; }; + PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.3"; sha256="1vsfhradfhk087vzi0jzkd7qab72g0v0x9s1rr7wblw7wjz48299"; depends=[AnnotationDbi RSQLite]; }; + PFAM_db = derive2 { name="PFAM.db"; version="3.2.2"; sha256="14q62rr08nwr2a4y26f4lnhxfwb2bx5dw1x0jyzdwk72pdslpwh8"; depends=[AnnotationDbi]; }; + POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.2"; sha256="0rz7nvvw19z0hmpni7yhds30hvw2dcy9p7knhj074hv9a6l174bw"; depends=[AnnotationDbi org_Hs_eg_db]; }; + PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.2"; sha256="1c89whi5iayjw3mqlw6793gr77y5kjs4j4fanl9waw9jxp0q2n5j"; depends=[AnnotationDbi org_Hs_eg_db]; }; + PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; + RaExExonProbesetLocation = derive2 { name="RaExExonProbesetLocation"; version="1.15.0"; sha256="1vvcc5zlpgbnqak4y2xywyd82j3s61wvhhp2ap0nni14sdxrl3hd"; depends=[AnnotationDbi]; }; + Rattus_norvegicus = derive2 { name="Rattus.norvegicus"; version="1.3.1"; sha256="0bpd7i5jvl2jvf822mhxankx7cqqr4l70xp4f7hcknxw3lxia2f1"; depends=[AnnotationDbi GenomicFeatures GO_db org_Rn_eg_db OrganismDbi TxDb_Rnorvegicus_UCSC_rn5_refGene]; }; + RmiR_Hs_miRNA = derive2 { name="RmiR.Hs.miRNA"; version="1.0.7"; sha256="0pybw908mlfrskwhnhc0bfaaqw2z13kvr10apf68s74zs0ss57b4"; depends=[AnnotationDbi]; }; + RmiR_hsa = derive2 { name="RmiR.hsa"; version="1.0.5"; sha256="1c663vxjxgrs4p9wfbg0zli5qqbvq6hp11kzbqrn70ndkpsbnb3z"; depends=[AnnotationDbi]; }; + RnAgilentDesign028282_db = derive2 { name="RnAgilentDesign028282.db"; version="3.2.2"; sha256="088bkg2j4rwg97q7n6v4abvvw5cfdfkr5kwzf75bbvv6nmzid7pd"; depends=[AnnotationDbi org_Rn_eg_db]; }; + Roberts2005Annotation_db = derive2 { name="Roberts2005Annotation.db"; version="3.2.2"; sha256="0i7baybh8rly2v09rla7x6n5x5rvyr2wvc14cjavb32wihg42jpb"; depends=[AnnotationDbi org_Hs_eg_db]; }; + SHDZ_db = derive2 { name="SHDZ.db"; version="3.2.2"; sha256="0rw33wa66fy00hbixgp78h6ykyxs8v9f9dp5dkp4c637cbplgvr5"; depends=[AnnotationDbi org_Hs_eg_db]; }; + SIFT_Hsapiens_dbSNP132 = derive2 { name="SIFT.Hsapiens.dbSNP132"; version="1.0.2"; sha256="1akqhmv9hp41q2jrvz4xvpdi30c4c6v4xbz6ykn6pdf0217p7xry"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; + SIFT_Hsapiens_dbSNP137 = derive2 { name="SIFT.Hsapiens.dbSNP137"; version="1.0.0"; sha256="1472abqanbwziyynr851xzhg7ck8w1n98ymmggg7s46hzix5mlj8"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; + SNPlocs_Hsapiens_dbSNP_20090506 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20090506"; version="0.99.9"; sha256="10943wbc56mz8ywcd71ndbdz7h3a9a17mzfdvj237wsgp62arfh6"; depends=[BSgenome GenomicRanges IRanges]; }; + SNPlocs_Hsapiens_dbSNP_20100427 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20100427"; version="0.99.7"; sha256="16m15sqxnczb399bcy7nll804h4955f6w8mag5jlda6h11yh732z"; depends=[GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP_20101109 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20101109"; version="0.99.7"; sha256="1r1gvx563gv1lidi099yw7lvf8c0983yck9yf8r8iypiz1d4az73"; depends=[GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP_20110815 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20110815"; version="0.99.7"; sha256="0nvpa44xy7zb9q63max1q0pmfibh976blmnirryxcca20j41f8ic"; depends=[GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP_20111119 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20111119"; version="0.99.7"; sha256="1znblqzb1hx5yjs2g387l3az8dga51si5blpwngvs0zbbdypgww8"; depends=[GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP_20120608 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20120608"; version="0.99.10"; sha256="10crnx5jk2790h936j515jgdf2mirzzmlnvn6pbp81fd5imkvdpd"; depends=[BSgenome GenomicRanges IRanges]; }; + SNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.10"; sha256="1a8ic2naa6bqc1fcylxc81j51xmc249fn40nk4yrvpjz59d6h381"; depends=[BSgenome GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP142_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP142.GRCh37"; version="0.99.5"; sha256="13kmgfwzwmbrwd2g24a3cbp634jih7jigzhzq55bzzf3js48h3n3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges]; }; + SNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.11"; sha256="069fkjplii6p63w8b3fjk87ynl5xv7d5bgnr78ia2n95yv6iqzjw"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.11"; sha256="1wzxb7d8v3yx8fvra4yy1zyvvh0l53ad87ksp3i1xj413cvph671"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Celegans_UCSC_ce6_ensGene = derive2 { name="TxDb.Celegans.UCSC.ce6.ensGene"; version="3.2.2"; sha256="1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Dmelanogaster_UCSC_dm3_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm3.ensGene"; version="3.2.2"; sha256="1337x23rdmiiza83ms225kri37h16q5hw1lw0m577abcgip3d7c7"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_BioMart_igis = derive2 { name="TxDb.Hsapiens.BioMart.igis"; version="2.3.2"; sha256="0590a2hkrpm33hmjg5g0gm6sig3xvc09m0q6lwmafgaajf90h6ky"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.1.3"; sha256="10250vgk5b9k7852n0ah47c4n535603mdm4swwlwbsh44438n544"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.2.2"; sha256="15p0n8snfsc3lml2zsmrsn5w4nq3h0pgvw82z0y6i43g0wg8fzl6"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.2.2"; sha256="0cvqp1pv632br5bd84g2ymb67hm4ijwqk43pycvwb2fvhzgx089c"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmusculus_UCSC_mm9_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm9.knownGene"; version="3.2.2"; sha256="16bjxy00363hf91ik2mqlqls86i07gia72qh92xc3l1ncch61mx2"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_BioMart_igis = derive2 { name="TxDb.Rnorvegicus.BioMart.igis"; version="2.3.2"; sha256="1099vkk8g3lxbgjxsm1p1m3mjj08nsw282mqxgzpnrxf7m6jll76"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_UCSC_rn4_ensGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn4.ensGene"; version="3.2.2"; sha256="0gv8bynfxxa471ap069mjvfrb1d7a0c4w5k8hxkr4hnsm44mschm"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.2.2"; sha256="07lhh3xk4n8nsq6an5hz4r2mgm3m05vx34nhxd7x4lvy224ar18h"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Scerevisiae_UCSC_sacCer2_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer2.sgdGene"; version="3.2.2"; sha256="0l5gcwhbvzx60p9hjhd31angamb0hkgdg2avga7341j77rd5pwza"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Scerevisiae_UCSC_sacCer3_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer3.sgdGene"; version="3.2.2"; sha256="1sjwl7fb3l3zxxbk8gkvzxwdsind0xjj7kmh7dachm6fi17hpb3d"; depends=[AnnotationDbi GenomicFeatures]; }; + XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + adme16cod_db = derive2 { name="adme16cod.db"; version="3.4.0"; sha256="1vn9s1lrl6zzs00madb111fdzqjfb45mprpjqap8bvib65942rvq"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ag_db = derive2 { name="ag.db"; version="3.2.2"; sha256="1d0n0vn0jyr83dli5dsv4hk9l8szgk0lcnxgrlh49bh3bspdkghd"; depends=[AnnotationDbi org_At_tair_db]; }; + agcdf = derive2 { name="agcdf"; version="2.18.0"; sha256="07hq41dwqs7yy2sck8p7zl3v9x4bgl35kkycpazz5ql2g5zy6b7j"; depends=[AnnotationDbi]; }; + agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; }; + anopheles_db0 = derive2 { name="anopheles.db0"; version="3.2.3"; sha256="1x2ac300nhd2k7wi3677jflymhyqk5bcrpfrnv1qxpbkkghsng7x"; depends=[AnnotationDbi]; }; + arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.2.3"; sha256="0pwc6i5v414ykrvhrh53c533g28l45hj0nldmvnz84gq9ppl3n6d"; depends=[AnnotationDbi]; }; + ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.2"; sha256="0780d3y44qf89yfvx6rk8sqf6f6h1m7b8vkv302p63qwanni3rwr"; depends=[AnnotationDbi org_At_tair_db]; }; + ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; }; + ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; }; + barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; }; + barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; }; + bovine_db = derive2 { name="bovine.db"; version="3.2.2"; sha256="00rr0jihd5ch29phxsrij3l764m3aq154rhh5riz2x781dpmmms1"; depends=[AnnotationDbi org_Bt_eg_db]; }; + bovine_db0 = derive2 { name="bovine.db0"; version="3.2.4"; sha256="1f8swzmr8z0m0c2xcfwn7iah8ws8pv851857rgn86xjqsfn7f39r"; depends=[AnnotationDbi]; }; + bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; }; + bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; }; + bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; }; + bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; }; + cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; }; + canine_db = derive2 { name="canine.db"; version="3.2.2"; sha256="03dmgi8v75vazxjx2p1flk41264vdj73m0k65plpbjybjpa7r72k"; depends=[AnnotationDbi org_Cf_eg_db]; }; + canine_db0 = derive2 { name="canine.db0"; version="3.2.3"; sha256="0ng7prqkb65n4hrpssiza4l9m6k42ld6adap33jl48yih7lml8dy"; depends=[AnnotationDbi]; }; + canine2_db = derive2 { name="canine2.db"; version="3.2.2"; sha256="15diwc2gvcaa79japppx6bfn086h8rrydpllmpvayj1ym7q3wljd"; depends=[AnnotationDbi org_Cf_eg_db]; }; + canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; }; + canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; }; + caninecdf = derive2 { name="caninecdf"; version="2.18.0"; sha256="1f7pf3y4ccmj6681haqk8ds3dlzkv99s22m2r462dnnf38n17l3p"; depends=[AnnotationDbi]; }; + canineprobe = derive2 { name="canineprobe"; version="2.18.0"; sha256="1y70rbxlbgx58vaxp1ry5jngvzz9prcbgd2ji00074ilx4k2cxn2"; depends=[AnnotationDbi]; }; + celegans_db = derive2 { name="celegans.db"; version="3.2.2"; sha256="17lk9gbm6hb99l0akc9sfvak89va2h4gxi5mnklpws27w7s6jzrp"; depends=[AnnotationDbi org_Ce_eg_db]; }; + celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; }; + celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; }; + chicken_db = derive2 { name="chicken.db"; version="3.2.2"; sha256="19ypq7sadvjdggzp5w1nk1jhxn9vmxpvwcnwczdyxx7f0y3ai1mp"; depends=[AnnotationDbi org_Gg_eg_db]; }; + chicken_db0 = derive2 { name="chicken.db0"; version="3.2.4"; sha256="0jp7264f83ss94m2i4r9kzcgcpq54344vqvjb51a11xf68hkcmj8"; depends=[AnnotationDbi]; }; + chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; }; + chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; }; + chimp_db0 = derive2 { name="chimp.db0"; version="3.2.3"; sha256="0cj1m9xddrd1dk71x25dm72smwmvpab9z5q2lp8qj9cc1xxz1amw"; depends=[AnnotationDbi]; }; + citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; }; + citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; }; + cottoncdf = derive2 { name="cottoncdf"; version="2.18.0"; sha256="0xfwwla941fbxddykgizpar8dh8q459src7kc5wyrsd3swp3zyp5"; depends=[AnnotationDbi]; }; + cottonprobe = derive2 { name="cottonprobe"; version="2.18.0"; sha256="04mfjd3a7ikif4pv46s6h9dj2s912w8ihg4yyiii7s3jlmvy62ah"; depends=[AnnotationDbi]; }; + cyp450cdf = derive2 { name="cyp450cdf"; version="2.18.0"; sha256="1mbqn9940sxc0ksvykdk3i4jvnkv9q91igwn1rwmv2z18hz18qf0"; depends=[AnnotationDbi]; }; + drosgenome1_db = derive2 { name="drosgenome1.db"; version="3.2.2"; sha256="13jwvbngrp45nn0a9x134n8y9fi4ibh7bqvnpz6am9sz7xz07lf0"; depends=[AnnotationDbi org_Dm_eg_db]; }; + drosgenome1cdf = derive2 { name="drosgenome1cdf"; version="2.18.0"; sha256="02x6kcnzayx3adz5kjrmfcly36j6j5xwwknd16nskh9050g8xg1y"; depends=[AnnotationDbi]; }; + drosgenome1probe = derive2 { name="drosgenome1probe"; version="2.18.0"; sha256="1vzf8197nkbdqdpafpafxlkcy61d6mwd7wcbakdhq5493dwhdi98"; depends=[AnnotationDbi]; }; + drosophila2_db = derive2 { name="drosophila2.db"; version="3.2.2"; sha256="1ih0icflafgvifmzzm57jaakd31wr91hs8fnkwbkmhah081llbkk"; depends=[AnnotationDbi org_Dm_eg_db]; }; + drosophila2cdf = derive2 { name="drosophila2cdf"; version="2.18.0"; sha256="1w8k5br8nl7m5l4r05af8nc2wwnlpxxl8ncvvhqx5annlb2ynrg3"; depends=[AnnotationDbi]; }; + drosophila2probe = derive2 { name="drosophila2probe"; version="2.18.0"; sha256="1b8wnkyg0p7cffs3ka7by295jsys1sx2gpbj2j63239f0dylpl0i"; depends=[AnnotationDbi]; }; + ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.2"; sha256="0r4ywlk2gicy3s3g5v070n51j0incc38g2p9hhx82sgbgah8pjgq"; depends=[AnnotationDbi org_EcK12_eg_db]; }; + ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; }; + ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; }; + ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.2.3"; sha256="0svmbaiaabgrl1p4bwwsaxsa7x5s4sdyrqcwxrfsfsdzzgvjkaxj"; depends=[AnnotationDbi]; }; + ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.2.3"; sha256="050ymh9jk2c21x4v56rbdigqp6ip6lv0sg7m6kr8sn8nqdl191mx"; depends=[AnnotationDbi]; }; + ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; }; + ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; }; + ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; }; + ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; }; + fly_db0 = derive2 { name="fly.db0"; version="3.2.3"; sha256="1dgc6qlnr0cmc7xip945696nn5r6gx53fzgjjr80c0r2ql04a4fp"; depends=[AnnotationDbi]; }; + gahgu133a_db = derive2 { name="gahgu133a.db"; version="2.2.0"; sha256="1ikyvj1gi39qbakpn5wl0823ljavng1k33zvpf2k24jdhdw927qb"; depends=[AnnotationDbi]; }; + gahgu133acdf = derive2 { name="gahgu133acdf"; version="2.2.1"; sha256="0hvd4iwj2fjiqp1jzbz68i1w6jn77nrsih316jlj85bhb35f7cyv"; depends=[]; }; + gahgu133aprobe = derive2 { name="gahgu133aprobe"; version="2.2.1"; sha256="108lki2bg55ysh485shxxsz1imm26g5a3grgcmxbfs4pgna3g4h0"; depends=[AnnotationDbi]; }; + gahgu133b_db = derive2 { name="gahgu133b.db"; version="2.2.0"; sha256="06hyjnr387wk40jjdk8gzqpfp4afjzva9fky3l4qs249ycy4snic"; depends=[AnnotationDbi]; }; + gahgu133bcdf = derive2 { name="gahgu133bcdf"; version="2.2.1"; sha256="0qbqirflzjy0is3m9zca1660aszxf947fa7d26baw6vm2b37qg4q"; depends=[]; }; + gahgu133bprobe = derive2 { name="gahgu133bprobe"; version="2.2.1"; sha256="1i8wcnp8434f6zxib86yhpm904clwg907x1hgjfsgy4viqa4jbqv"; depends=[AnnotationDbi]; }; + gahgu133plus2_db = derive2 { name="gahgu133plus2.db"; version="2.2.0"; sha256="1p48q1zqrjdvv6qq5br9v24fpryp2zy3z079nkgrgr4d2brvhab8"; depends=[AnnotationDbi]; }; + gahgu133plus2cdf = derive2 { name="gahgu133plus2cdf"; version="2.2.1"; sha256="1fmv6rrjbii1g5grcvgl13w814mbqqyqyav0wi82d30v4ijz58g9"; depends=[]; }; + gahgu133plus2probe = derive2 { name="gahgu133plus2probe"; version="2.2.1"; sha256="0r3vizwmvy0jmsqbplagkincj5xs71dk7csgwwv4arx80kbl9l9l"; depends=[AnnotationDbi]; }; + gahgu95av2_db = derive2 { name="gahgu95av2.db"; version="2.2.0"; sha256="1c1hc79rjisx7jd7sdlr2d1lnk621y8azshriia12b5z0l5j9m4h"; depends=[AnnotationDbi]; }; + gahgu95av2cdf = derive2 { name="gahgu95av2cdf"; version="2.2.1"; sha256="1ckcjlb4v9x9zynf5w1h5fgmdr4ck22h9bjfwz3n184v48wgi39r"; depends=[]; }; + gahgu95av2probe = derive2 { name="gahgu95av2probe"; version="2.2.1"; sha256="033zk49kp4r5in6yk3za8ll5wrchiklfrzc10c8lgqhpm6y8y5k2"; depends=[AnnotationDbi]; }; + gahgu95b_db = derive2 { name="gahgu95b.db"; version="2.2.0"; sha256="0v4lpbqqhm6mvpm0biykcq0ym1rb968zcwp9rg1lv6zka5arj9fq"; depends=[AnnotationDbi]; }; + gahgu95bcdf = derive2 { name="gahgu95bcdf"; version="2.2.1"; sha256="1f8yp4g3cjbl11x0wajln7bms3jhy6cbyh0bggm38gbb18gws4wg"; depends=[]; }; + gahgu95bprobe = derive2 { name="gahgu95bprobe"; version="2.2.1"; sha256="1lr91f57ym3lxz5bi9xm3g63vskw5js991h5zk4c2i2npi0x22gm"; depends=[AnnotationDbi]; }; + gahgu95c_db = derive2 { name="gahgu95c.db"; version="2.2.0"; sha256="1psjf511agrv7nma4wa39jgd82z82df42d5g8jvwjrm2wb6l2v4l"; depends=[AnnotationDbi]; }; + gahgu95ccdf = derive2 { name="gahgu95ccdf"; version="2.2.1"; sha256="1lcal0y48vhafikkrn744l1gxrnlhkh7jmmhb7pglc9ldh7x9azh"; depends=[]; }; + gahgu95cprobe = derive2 { name="gahgu95cprobe"; version="2.2.1"; sha256="155vnch85m6ph7av8j4ylrqajm3vc2v623qpkixqh06l4fy59pck"; depends=[AnnotationDbi]; }; + gahgu95d_db = derive2 { name="gahgu95d.db"; version="2.2.0"; sha256="0k0ricb8cl3xh93nq8rr3206w18b91ca67992cc5b2fbaf8lxlba"; depends=[AnnotationDbi]; }; + gahgu95dcdf = derive2 { name="gahgu95dcdf"; version="2.2.1"; sha256="181h5i9ywpn6vwdvcd2sq5yxkx41h09plgqsdfigw5w7816524k6"; depends=[]; }; + gahgu95dprobe = derive2 { name="gahgu95dprobe"; version="2.2.1"; sha256="0znll2h3cm1sbyzjk121fxizs4qv5jd80kslr5zhdd73dkdlzlbm"; depends=[AnnotationDbi]; }; + gahgu95e_db = derive2 { name="gahgu95e.db"; version="2.2.0"; sha256="1qbsshgvzfavpjrawn3lbl0pcfwl0g7n8vr1109gvax6gj00la7n"; depends=[AnnotationDbi]; }; + gahgu95ecdf = derive2 { name="gahgu95ecdf"; version="2.2.1"; sha256="1bsh380h7ai4l6j8jjz8yzfdwgxyhpnqm5fnb6mgma76xbiwab4b"; depends=[]; }; + gahgu95eprobe = derive2 { name="gahgu95eprobe"; version="2.2.1"; sha256="0c4zx8d7qsb3xhy0prfh7l6xbklgpxbbznqhq9mmgjb8qh5g9ygz"; depends=[AnnotationDbi]; }; + genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; }; + genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; }; + gp53cdf = derive2 { name="gp53cdf"; version="2.18.0"; sha256="11p69rxia8bqajix3jg34vnhczyxgpq50k5kdh878h7bn0mpg6bj"; depends=[AnnotationDbi]; }; + grasp2db = derive2 { name="grasp2db"; version="0.1.9"; sha256="1667hhk547fs8v7xsz2d0l19r2fksk1ymnpvag1jwspb2m10lq22"; depends=[AnnotationHub digest dplyr GenomeInfoDb RSQLite]; }; + h10kcod_db = derive2 { name="h10kcod.db"; version="3.4.0"; sha256="0f30n339ib8q478a7axjdh8hzrqws762m680ha0sxm3a0nxwapgg"; depends=[AnnotationDbi org_Hs_eg_db]; }; + h20kcod_db = derive2 { name="h20kcod.db"; version="3.4.0"; sha256="0csh59bgpn5xyaw6bfg7nvi9vcvjd4f66f0dr3xh7c6316835mnx"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hapmap370k = derive2 { name="hapmap370k"; version="1.0.1"; sha256="0n6rmrqcbl665a1l6jxk1gn6518x4gxadzy5dc9k9v01cbh3qzmw"; depends=[]; }; + hcg110_db = derive2 { name="hcg110.db"; version="3.2.2"; sha256="06hbf6r86s5xvbn4l9hpikr504nb0wg680vvqflr3c9xpnaczfap"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hcg110cdf = derive2 { name="hcg110cdf"; version="2.18.0"; sha256="1208b5sn9cdsvz4wa29ha5vp9mpvafkq0adj7nlzs4yav2z26van"; depends=[AnnotationDbi]; }; + hcg110probe = derive2 { name="hcg110probe"; version="2.18.0"; sha256="0avr5dmm86b81fli5zb2vp6ax8imqxvc5bzsksq574a8rn6xf1dq"; depends=[AnnotationDbi]; }; + hgfocus_db = derive2 { name="hgfocus.db"; version="3.2.2"; sha256="0f9mr56mxs3abryhy19rz1kis4p1v9c595wvbmmk6d61gada2z7h"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgfocuscdf = derive2 { name="hgfocuscdf"; version="2.18.0"; sha256="0vxgz3wwjf4qqzpsa8d03s7p2az9xbzlkxkdj0czcj67nmq467ya"; depends=[AnnotationDbi]; }; + hgfocusprobe = derive2 { name="hgfocusprobe"; version="2.18.0"; sha256="0fizkj2g1imslxk43ibf52nj8jzsfryq7h2pzhvqw5n9vnpinrc2"; depends=[AnnotationDbi]; }; + hgu133a_db = derive2 { name="hgu133a.db"; version="3.2.2"; sha256="18xcpbr3zd80fwx6ac99ng6wmv4r2my369gn559f936yganhnzsa"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu133a2_db = derive2 { name="hgu133a2.db"; version="3.2.2"; sha256="077dng6gwss73vaxakkmk8dzy78cfb7872r4v1qj5drxp68wz1li"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu133a2cdf = derive2 { name="hgu133a2cdf"; version="2.18.0"; sha256="0lqllzvp0w3s46kjvpvjn1snz63im33m3hhvnkl3knb86k6pn3za"; depends=[AnnotationDbi]; }; + hgu133a2frmavecs = derive2 { name="hgu133a2frmavecs"; version="1.2.0"; sha256="1qy2z6z135q8xncjqn1n31xg8az9wnwrz78cis57lzav9r0fw853"; depends=[]; }; + hgu133a2probe = derive2 { name="hgu133a2probe"; version="2.18.0"; sha256="0ais6f92kmjmzywsdqvxcd5fs6y7kf0ip9wm62szhahyl9chwj9k"; depends=[AnnotationDbi]; }; + hgu133acdf = derive2 { name="hgu133acdf"; version="2.18.0"; sha256="10aa0vz4hpb26k5jrz56s2f8zszvwc7axj03zzrn3q0wgrw68nc6"; depends=[AnnotationDbi]; }; + hgu133afrmavecs = derive2 { name="hgu133afrmavecs"; version="1.5.0"; sha256="1dh37ilc1df4i67k1by22r1r4d7iqy77f3hvnd470fwmcg07mkj6"; depends=[]; }; + hgu133aprobe = derive2 { name="hgu133aprobe"; version="2.18.0"; sha256="15r9zy4g9p86344zf0w7m0vfln8js19kmr68vq670kncf6j6ypbn"; depends=[AnnotationDbi]; }; + hgu133atagcdf = derive2 { name="hgu133atagcdf"; version="2.18.0"; sha256="0rbnhzwbv6nbkssdgsibjpnqfads7x9rpgy2n7qy02mkr6kysndg"; depends=[AnnotationDbi]; }; + hgu133atagprobe = derive2 { name="hgu133atagprobe"; version="2.18.0"; sha256="1qxrdi0rjj8kcl8rl3lack5ky25n39hj5a91scd0fy32zvnazmk6"; depends=[AnnotationDbi]; }; + hgu133b_db = derive2 { name="hgu133b.db"; version="3.2.2"; sha256="0s5h54fqfmc3k1cgcaq0skdlnd7yzzwh9gvfnv4prg3mwvmsvacy"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu133bcdf = derive2 { name="hgu133bcdf"; version="2.18.0"; sha256="0dlg45pf35cff48704laryrxgwr0p31njki6c74ibxacpxmvwzv3"; depends=[AnnotationDbi]; }; + hgu133bprobe = derive2 { name="hgu133bprobe"; version="2.18.0"; sha256="1i8v1fbjfnzv556551kbj13q9i0lvzjgvzq8xapmwph8y86bfcx3"; depends=[AnnotationDbi]; }; + hgu133plus2_db = derive2 { name="hgu133plus2.db"; version="3.2.2"; sha256="0x21g8iwr9zj29xj5y16byg4nbnslgkh8l5hxhayckz3hirzns5f"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu133plus2cdf = derive2 { name="hgu133plus2cdf"; version="2.18.0"; sha256="03n9vmclv2ri6n88lsz8yzgsrz33vfclj468jv01h3is2gq09x99"; depends=[AnnotationDbi]; }; + hgu133plus2frmavecs = derive2 { name="hgu133plus2frmavecs"; version="1.5.0"; sha256="1r3g4hqxxm3l054kx33bsl9qkd46mkd4d266pm0jgqih6mv5640c"; depends=[]; }; + hgu133plus2probe = derive2 { name="hgu133plus2probe"; version="2.18.0"; sha256="1xdg6x6iv9xi0vdlfl4c65zvqs2946yd2bhr9nqhhyqp6h8ghsdc"; depends=[AnnotationDbi]; }; + hgu219_db = derive2 { name="hgu219.db"; version="3.2.2"; sha256="0im7537pfv25ayagbjvc5p83xkl4ppzr329q2qw4b3yknvj51fr7"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu219cdf = derive2 { name="hgu219cdf"; version="2.18.0"; sha256="14kbn7r84hp4vssxl8pfs7zlg34mdm4qf1m2dw7agrixmdblnz0d"; depends=[AnnotationDbi]; }; + hgu219probe = derive2 { name="hgu219probe"; version="2.18.0"; sha256="0sy5q95yppyg8bvwc6prznqzl01xrbl0ic22rj2s8wwsrppsm3m5"; depends=[AnnotationDbi]; }; + hgu95a_db = derive2 { name="hgu95a.db"; version="3.2.2"; sha256="056wf0zqsnb0w3izwqwhk0fjnaxv1barp4ndlzyq9lzbp37skb2l"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95acdf = derive2 { name="hgu95acdf"; version="2.18.0"; sha256="1mxac5vd0vzn3k8357lf0j1476q3b7nx6nr54n6j84qi2nx1wknr"; depends=[AnnotationDbi]; }; + hgu95aprobe = derive2 { name="hgu95aprobe"; version="2.18.0"; sha256="0sig3g5qmigv7vgcr3rpkn2cmcn2ljp0arhilni7yqsnzqn1dbma"; depends=[AnnotationDbi]; }; + hgu95av2 = derive2 { name="hgu95av2"; version="2.2.0"; sha256="181bady90v89yx2gzwahhcl63aiypcx33pkfnjxkyq45qgb18bqi"; depends=[]; }; + hgu95av2_db = derive2 { name="hgu95av2.db"; version="3.2.2"; sha256="0rh6lf3017cm1k805v4c7dq551vjgjxdwqawin5jc03smbpi67wi"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95av2cdf = derive2 { name="hgu95av2cdf"; version="2.18.0"; sha256="1zp1y5awnkprkmk01rmn881y50bslfi8s33i8bws39am5xma0jfl"; depends=[AnnotationDbi]; }; + hgu95av2probe = derive2 { name="hgu95av2probe"; version="2.18.0"; sha256="0hv0asd44b69h3n87j5ffi9i87w12iad74754wzxgfxihb0yn58g"; depends=[AnnotationDbi]; }; + hgu95b_db = derive2 { name="hgu95b.db"; version="3.2.2"; sha256="1snz8khvppwlalphyid21a366vz2c8barbx7da32klblwmryiyqi"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95bcdf = derive2 { name="hgu95bcdf"; version="2.18.0"; sha256="10inx0p0155ii4464la0amww91ynyqqh59zyl1lfhnvkl38k6ylj"; depends=[AnnotationDbi]; }; + hgu95bprobe = derive2 { name="hgu95bprobe"; version="2.18.0"; sha256="1y8i2cn0zh2jkyi9j8giv5i4dag2c7jd5zyaza72nsyj4qhgmccg"; depends=[AnnotationDbi]; }; + hgu95c_db = derive2 { name="hgu95c.db"; version="3.2.2"; sha256="1ckfn7nww2bha9vvdghijzrzpkfc0bv5pr1ph20lkj5hvn6bra2f"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95ccdf = derive2 { name="hgu95ccdf"; version="2.18.0"; sha256="1mai2l81mwg3irncvddlcbcx24nvfk0gcx4h1r3mfg47smx1n3rd"; depends=[AnnotationDbi]; }; + hgu95cprobe = derive2 { name="hgu95cprobe"; version="2.18.0"; sha256="0glbyjk0mfllfzwfj5hszmy4pwd5ghkb1lrzh215zzxyvnyb47fd"; depends=[AnnotationDbi]; }; + hgu95d_db = derive2 { name="hgu95d.db"; version="3.2.2"; sha256="1vqn87vln1mk4bxbd01jq6660z1px8nkyagbkhp1vy26cqwrmg5w"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95dcdf = derive2 { name="hgu95dcdf"; version="2.18.0"; sha256="0s60ibk6qsfqibhns2kidglvxkigia31yzr49b03kcazmwm4xqc0"; depends=[AnnotationDbi]; }; + hgu95dprobe = derive2 { name="hgu95dprobe"; version="2.18.0"; sha256="0mlj28c82b21010rhj2pzpmv2wf3fis4dwsi7q7292bza2sxxi6g"; depends=[AnnotationDbi]; }; + hgu95e_db = derive2 { name="hgu95e.db"; version="3.2.2"; sha256="1fzw86wycjlgi7vym47p1ningl2vhcyj6rwlp9l93ayg16lkq2fc"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgu95ecdf = derive2 { name="hgu95ecdf"; version="2.18.0"; sha256="02y97vbhxn3c31q1i2z5l6jv51z8bk8p7vp1kb2y8rkmsw171brv"; depends=[AnnotationDbi]; }; + hgu95eprobe = derive2 { name="hgu95eprobe"; version="2.18.0"; sha256="1daflz4s99xb0v91ckb96bzjqmgm334xsngz18l2bd6r8nkxhgzb"; depends=[AnnotationDbi]; }; + hguDKFZ31_db = derive2 { name="hguDKFZ31.db"; version="3.2.2"; sha256="1biz5imp5z6nippz2g5ky1j1zd9ckz1c1yi57rffxa3gc2nm35rh"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hguatlas13k_db = derive2 { name="hguatlas13k.db"; version="3.2.2"; sha256="14a1annbrvkh05akivhbm7p8pdsv6lknrlhvj8n3m5bxlbrr6ii5"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgubeta7_db = derive2 { name="hgubeta7.db"; version="3.2.2"; sha256="1g7wbbijj210w0g4cas6d7ig92ndsm6kfgs5jd7h55avsjjp7jcj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4100a_db = derive2 { name="hgug4100a.db"; version="3.2.2"; sha256="05wb186mrz9rrffiap2ck4k4x9r5liyd3j85zm59a4pqanvlm2a6"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4101a_db = derive2 { name="hgug4101a.db"; version="3.2.2"; sha256="0l0p4c85p2fak8ip9jyas5g6axziq0jidkmz6baigg7cxrjl4m4m"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4110b_db = derive2 { name="hgug4110b.db"; version="3.2.2"; sha256="10qclkkxs7hi0h5h30zqbz2yija9vrp482xahygrc55ihwgpqr3l"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4111a_db = derive2 { name="hgug4111a.db"; version="3.2.2"; sha256="02sx9ph6n6z36q1a03dpld8lki9in082akiaf2g115inmcd7ss0h"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4112a_db = derive2 { name="hgug4112a.db"; version="3.2.2"; sha256="07pclh2cabf5nmf631x8gs713mjz2w132ilmlr284s1m3667p94r"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hgug4845a_db = derive2 { name="hgug4845a.db"; version="0.0.3"; sha256="1933n2n6yky40nxf1qlbpa6acjwfr07hbrpvvcick7m09al1wks6"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hguqiagenv3_db = derive2 { name="hguqiagenv3.db"; version="3.2.2"; sha256="0jbvggypg50wkcxyx7xxn87cnhvbyndfqkgdzrpcm8p1czw2gkvz"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hi16cod_db = derive2 { name="hi16cod.db"; version="3.4.0"; sha256="0ydi0jljx8igzrqaspr9yywv43h2zimm9fk7xc55nm6mnp5jl7kl"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hivprtplus2cdf = derive2 { name="hivprtplus2cdf"; version="2.18.0"; sha256="1jv4qzajikz7x4vq87wzn7hf6hx9r4c2gkjhfp93kqzwzddmigf4"; depends=[AnnotationDbi]; }; + hom_At_inp_db = derive2 { name="hom.At.inp.db"; version="3.1.2"; sha256="1ka9ssjfxml9sz9k83bs6icbkkyz581svh0pwpvpifzg79qapzwi"; depends=[AnnotationDbi]; }; + hom_Ce_inp_db = derive2 { name="hom.Ce.inp.db"; version="3.1.2"; sha256="1iw2xy8yfx1khxy4fkilfq6ms0m9l4q8lz4y0y50fvsh8iiygy98"; depends=[AnnotationDbi]; }; + hom_Dm_inp_db = derive2 { name="hom.Dm.inp.db"; version="3.1.2"; sha256="0akg9ay7rgb3j5ckjmv4q9gvnnfhyfaad1phfr1j8zmkdr50x4kw"; depends=[AnnotationDbi]; }; + hom_Dr_inp_db = derive2 { name="hom.Dr.inp.db"; version="3.1.2"; sha256="1x4iikf8b5awmg1m9x9wn2fzwsqq93l8yibrkc4r7x7dvm005yg7"; depends=[AnnotationDbi]; }; + hom_Hs_inp_db = derive2 { name="hom.Hs.inp.db"; version="3.1.2"; sha256="0fixdcc80a3vb735pqafzva5cw02ygkf5pfy1ncws3f84s3p3zld"; depends=[AnnotationDbi]; }; + hom_Mm_inp_db = derive2 { name="hom.Mm.inp.db"; version="3.1.2"; sha256="034b9wiis7w7zj3647s0fh1jspyfn654yf0lm5ymp65sww965cxh"; depends=[AnnotationDbi]; }; + hom_Rn_inp_db = derive2 { name="hom.Rn.inp.db"; version="3.1.2"; sha256="02smfm88y72dgmj2kna9v7sbcg5dxr8b4sqgy6i8b3zw3a6776yp"; depends=[AnnotationDbi]; }; + hom_Sc_inp_db = derive2 { name="hom.Sc.inp.db"; version="3.1.2"; sha256="0l9nly3k7jnf6g1qnwyw22ga1hdyjdvn3hrlway8pb9rv7279bil"; depends=[AnnotationDbi]; }; + hs25kresogen_db = derive2 { name="hs25kresogen.db"; version="2.5.0"; sha256="1yp25ifm3bwzkzm8vimlxw5slini7drhvmh5ggh0z80sfrjyndyf"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hspeccdf = derive2 { name="hspeccdf"; version="0.99.1"; sha256="07azl9zpg552ic7li14p6n09ba3jbqqclwffjfpd2vc249x0n4fw"; depends=[AnnotationDbi]; }; + hta20stprobeset_db = derive2 { name="hta20stprobeset.db"; version="8.3.0"; sha256="05blv54srnw7yrs8x32syzk1xdksrl8gswk837m7qjgciq8hazcn"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hta20sttranscriptcluster_db = derive2 { name="hta20sttranscriptcluster.db"; version="8.3.1"; sha256="0ana9fg3ms22m394w8qbfvfy663l0r163w0qfwh5ir59rs4bpalf"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hthgu133a_db = derive2 { name="hthgu133a.db"; version="3.2.2"; sha256="0hkkpxh7737dv6msjkfir84sh85fgy9rz3h3mndsslsfjn7j17kk"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hthgu133acdf = derive2 { name="hthgu133acdf"; version="2.18.0"; sha256="1a5b421lx0nxy3mrrxjxifwjpnv289c5q2a89xhnkwlcfhqlzqrp"; depends=[AnnotationDbi]; }; + hthgu133afrmavecs = derive2 { name="hthgu133afrmavecs"; version="1.3.0"; sha256="0466xgi67r5rpp7cs06ib0cr6vvx8d881g5l96b8sh9948pbn4ss"; depends=[]; }; + hthgu133aprobe = derive2 { name="hthgu133aprobe"; version="2.18.0"; sha256="0fanrxa21h961zsgzjrv4mzv8psd3h9sjxrzr126ca8qfqghvkc3"; depends=[AnnotationDbi]; }; + hthgu133b_db = derive2 { name="hthgu133b.db"; version="3.2.2"; sha256="1vzhjqf5qh5j7wpgrl8p12b1fn6cy5nk643p1bq26cz3xr4r593a"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hthgu133bcdf = derive2 { name="hthgu133bcdf"; version="2.18.0"; sha256="0v12g1xsmycxhapzl6i5m7jq683k05y9yaq1asxvwls0viph6dv0"; depends=[AnnotationDbi]; }; + hthgu133bprobe = derive2 { name="hthgu133bprobe"; version="2.18.0"; sha256="1cqv6zwdxgc27x1h6y6lqzdysx40bbiy1ywcxky4yc611l1lxbv5"; depends=[AnnotationDbi]; }; + hthgu133pluspmcdf = derive2 { name="hthgu133pluspmcdf"; version="2.18.0"; sha256="0bslylkmgrq9v1giz87kcikmxbs8yawpylxi0s1n6q4rcc2yg61y"; depends=[AnnotationDbi]; }; + hthgu133pluspmprobe = derive2 { name="hthgu133pluspmprobe"; version="2.18.0"; sha256="0ifgrw6b5cr4fj88n4r0skzw6vj4c88bjlahjbik4jfi738qwqp7"; depends=[AnnotationDbi]; }; + htmg430acdf = derive2 { name="htmg430acdf"; version="2.18.0"; sha256="1m854lnr82gyx8hbbd5h66s46jh41s7mp1ymjm9fh32jw2pak1i9"; depends=[AnnotationDbi]; }; + htmg430aprobe = derive2 { name="htmg430aprobe"; version="2.18.0"; sha256="1alhk7h7a8d49plgaxw95nffwga51asrgwzf4zj52al8brymays8"; depends=[AnnotationDbi]; }; + htmg430bcdf = derive2 { name="htmg430bcdf"; version="2.18.0"; sha256="1a0r50z47sb8dyq0x43nibh3whq1gi3nggphybwmrd70nr2y09zh"; depends=[AnnotationDbi]; }; + htmg430bprobe = derive2 { name="htmg430bprobe"; version="2.18.0"; sha256="1qaw0213fvpn222hnpbm6hgi2cc69sv6bl72y3h85f50sl4rf8i9"; depends=[AnnotationDbi]; }; + htmg430pmcdf = derive2 { name="htmg430pmcdf"; version="2.18.0"; sha256="1ayd1xarlwh7jm3dmaq9j49z4fi2qsrz48jy37xfg9q1wwawvwyw"; depends=[AnnotationDbi]; }; + htmg430pmprobe = derive2 { name="htmg430pmprobe"; version="2.18.0"; sha256="02cg12fnn3nbgra7f2lwabi750ws943372p5xc78bjxf9ypql4i5"; depends=[AnnotationDbi]; }; + htrat230pmcdf = derive2 { name="htrat230pmcdf"; version="2.18.0"; sha256="0b0gwa32as2l5m951y01dk8i16yl995221dg7ycq97kq4jb5dmdx"; depends=[AnnotationDbi]; }; + htrat230pmprobe = derive2 { name="htrat230pmprobe"; version="2.18.0"; sha256="0xpyj6c8j4icx25yk570b4gnfqz8zrsp8wlsw8424xvkviz0wv4y"; depends=[AnnotationDbi]; }; + htratfocuscdf = derive2 { name="htratfocuscdf"; version="2.18.0"; sha256="0jqn7y17sjn2cg8lidsbyzwpjygjs553gaw72g6v2kxj7j0fhfx9"; depends=[AnnotationDbi]; }; + htratfocusprobe = derive2 { name="htratfocusprobe"; version="2.18.0"; sha256="1yxpb9pq4gbmq8s6szlbnc70ngqgi5gwqxx3far673gm5czdlfzi"; depends=[AnnotationDbi]; }; + hu35ksuba_db = derive2 { name="hu35ksuba.db"; version="3.2.2"; sha256="0bbqjazg7441bm7s5giax43w5zl4k6yrwaxjwwxz9rmkq1vqs1j7"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hu35ksubacdf = derive2 { name="hu35ksubacdf"; version="2.18.0"; sha256="1aw41anp99r0m0c54yibvh3nzswi5wnqv9z7dwi5396sd5sniy81"; depends=[AnnotationDbi]; }; + hu35ksubaprobe = derive2 { name="hu35ksubaprobe"; version="2.18.0"; sha256="0dnsch3wdcgffbg1ypnnmsxlrclk9wji11skcs1gih2f7wi4pk05"; depends=[AnnotationDbi]; }; + hu35ksubb_db = derive2 { name="hu35ksubb.db"; version="3.2.2"; sha256="1gazpw4n0r4dmjvigljcci2wv656ccyvpsxczhhh43yfaskcxk55"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hu35ksubbcdf = derive2 { name="hu35ksubbcdf"; version="2.18.0"; sha256="0anzhbn7ad5yv3qd4vwxaag809yb9saqwx6575iwc9ha5w8hwv2m"; depends=[AnnotationDbi]; }; + hu35ksubbprobe = derive2 { name="hu35ksubbprobe"; version="2.18.0"; sha256="0wml8g7nizljjfxq6xbbld3b2lsl1p8rzdmdqg5h81ncg7xhxy7c"; depends=[AnnotationDbi]; }; + hu35ksubc_db = derive2 { name="hu35ksubc.db"; version="3.2.2"; sha256="0xnhaqvgs0rdvn9prxkq2hi7wxb6z05446dlh2b365dsmvy87pwr"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hu35ksubccdf = derive2 { name="hu35ksubccdf"; version="2.18.0"; sha256="0fycaw7sngcj50qh8vw594g7i0fw9nmfh1lw72bc3i8jd5y08npi"; depends=[AnnotationDbi]; }; + hu35ksubcprobe = derive2 { name="hu35ksubcprobe"; version="2.18.0"; sha256="1s22447qznyrlwpa98wric7xv2aj1qchd5wgq1zgwhg3gcj9lvmb"; depends=[AnnotationDbi]; }; + hu35ksubd_db = derive2 { name="hu35ksubd.db"; version="3.2.2"; sha256="0af1dr9mqxkl8jkpbm9f6ifs7xrzjsrsv57sxfcm55h3p12fdw7n"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hu35ksubdcdf = derive2 { name="hu35ksubdcdf"; version="2.18.0"; sha256="1ws1mfgi1bndlwhr049bssj6cmd819klp1vwnqppklggs081y22v"; depends=[AnnotationDbi]; }; + hu35ksubdprobe = derive2 { name="hu35ksubdprobe"; version="2.18.0"; sha256="1vivxdpg6wn29jwfnw7brcqav1xbr62llqk13dgj10x0gvjmv26w"; depends=[AnnotationDbi]; }; + hu6800_db = derive2 { name="hu6800.db"; version="3.2.2"; sha256="1dsjs3km0qr1y49r0m2vl04jqlcgnywvcv1kayn8i04rg568zsy4"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hu6800cdf = derive2 { name="hu6800cdf"; version="2.18.0"; sha256="1anddmc7j8x79nrglzmyzdvpwhy8aq6b87hqh7gr40g3d6hxjg06"; depends=[AnnotationDbi]; }; + hu6800probe = derive2 { name="hu6800probe"; version="2.18.0"; sha256="1fnkwifpzv0rkb9f5b789f2r5vvz9riwiip5wmyanw2gzdyc2vr0"; depends=[AnnotationDbi]; }; + hu6800subacdf = derive2 { name="hu6800subacdf"; version="2.18.0"; sha256="0ckywgdz9n9xz162jw6phj3qwdkiwjb4ya86a3imgb71k3w181wz"; depends=[AnnotationDbi]; }; + hu6800subbcdf = derive2 { name="hu6800subbcdf"; version="2.18.0"; sha256="1bqgcp17pj3r78n6lqr307r1snxb3vxpmr7h64qbq8jmwrlxgs60"; depends=[AnnotationDbi]; }; + hu6800subccdf = derive2 { name="hu6800subccdf"; version="2.18.0"; sha256="1xir2k62whqf39g7g5rm646nz6hxq83nldrrc3cyzch85723a55p"; depends=[AnnotationDbi]; }; + hu6800subdcdf = derive2 { name="hu6800subdcdf"; version="2.18.0"; sha256="1caiyyna5ffnnx85h9f62h2fwd42wwi187g9igspcy8mn2hakpfw"; depends=[AnnotationDbi]; }; + huex_1_0_st_v2frmavecs = derive2 { name="huex.1.0.st.v2frmavecs"; version="1.1.0"; sha256="0fnadflyg615v7w071jilg42w8w5fvnac7rm0wg33klvzx9c9knx"; depends=[]; }; + huex10stprobeset_db = derive2 { name="huex10stprobeset.db"; version="8.4.0"; sha256="1kppimky5d2qnl7sv4xnghb477lwizjy5zznrd9dkvxii5msyf2v"; depends=[AnnotationDbi org_Hs_eg_db]; }; + huex10sttranscriptcluster_db = derive2 { name="huex10sttranscriptcluster.db"; version="8.4.0"; sha256="1m3s1bnwvr50jcpwqax4bnlcan9j01l4q01jg3yaf62ww9wlhdw2"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene_1_0_st_v1frmavecs = derive2 { name="hugene.1.0.st.v1frmavecs"; version="1.1.0"; sha256="0jwk5mm37fil3h9h1hrc4bm3sxfdzywbmsqm1blvrvb5q6jgl50a"; depends=[]; }; + hugene10stprobeset_db = derive2 { name="hugene10stprobeset.db"; version="8.4.0"; sha256="1a6jsr65hcj5799iymrzhn2r8cnjp8916hixacjks01z5civzgfb"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene10sttranscriptcluster_db = derive2 { name="hugene10sttranscriptcluster.db"; version="8.4.0"; sha256="03bvwawba9r8ayhzjiszn60h5v4qms64xk11q3qfj5d5kxc61374"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene10stv1cdf = derive2 { name="hugene10stv1cdf"; version="2.18.0"; sha256="1drsclrcf344z4m61qxd1a1lg2qrd2h7s3y6kk7xcy76s2mqjx2f"; depends=[AnnotationDbi]; }; + hugene10stv1probe = derive2 { name="hugene10stv1probe"; version="2.18.0"; sha256="1cn6hdw1mj0i4f0syvx8g1r02bbki994y3s9hrdps3kvcbaw6brd"; depends=[AnnotationDbi]; }; + hugene11stprobeset_db = derive2 { name="hugene11stprobeset.db"; version="8.4.0"; sha256="0sycgmzzmaf1aqi48f4nvh9y514n4f4v3cd3cdcq926grajv6l2v"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene11sttranscriptcluster_db = derive2 { name="hugene11sttranscriptcluster.db"; version="8.4.0"; sha256="19v0zkqz81v97np2azbnrxnmw19a5z1fh523d2y28hiyp0z62hlr"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20stprobeset_db = derive2 { name="hugene20stprobeset.db"; version="8.4.0"; sha256="1dh9115c1nd1a744adxcgjk2rxhj5ngvh6v4l1832a659z1q85lz"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.4.0"; sha256="16ynwlnl5qkf3in7b08lf8k5v1q0sr0zd2hl52pl8yvpqxsm7sdz"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.4.0"; sha256="07cza2h7r0ipc4c3z14gw2vca4zqx2l0s41hz5fj0g6ss2a7n2qj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.4.0"; sha256="1xqwq17xvmfbhy89di2gwg8c7r52ihp50qckqiqi0qdv5w59vbfj"; depends=[AnnotationDbi org_Hs_eg_db]; }; + human_db0 = derive2 { name="human.db0"; version="3.2.4"; sha256="0yblrj9p4pihxdhgh649dlciwqhx7538ni4mk02wkrk66h3n6cpc"; depends=[AnnotationDbi]; }; + human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; }; + human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; }; + human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; }; + human370v1cCrlmm = derive2 { name="human370v1cCrlmm"; version="1.0.2"; sha256="1fhvgc6phhy8fqrl8bwjyskjl95bwlc08jyrkhsivml3ngbsfdf7"; depends=[]; }; + human550v3bCrlmm = derive2 { name="human550v3bCrlmm"; version="1.0.4"; sha256="01a7dchjdl5x3jy6q4f13vlpj5d5l0gn1rf7qpnqrsa33q7fkk0q"; depends=[]; }; + human610quadv1bCrlmm = derive2 { name="human610quadv1bCrlmm"; version="1.0.3"; sha256="0x8pvpzwhy46r8k9spb9vdanzwd3kcslib2aa97ziamm9rdgpnq4"; depends=[]; }; + human650v3aCrlmm = derive2 { name="human650v3aCrlmm"; version="1.0.3"; sha256="05zpb18b5zcfpv9jhfjqq5la47cn7dwfr46dvph0z4hgxrj7qiwb"; depends=[]; }; + human660quadv1aCrlmm = derive2 { name="human660quadv1aCrlmm"; version="1.0.3"; sha256="0gz9r08jdmc8zg9fpr8xs51krvbmi6g2ni7aaxq3yzzyv3ip04xx"; depends=[]; }; + humanCHRLOC = derive2 { name="humanCHRLOC"; version="2.1.6"; sha256="1mxj7h8qjalax9hjxqydykldl3spavnpr5x9ar74784wabsllhgi"; depends=[]; }; + humancytosnp12v2p1hCrlmm = derive2 { name="humancytosnp12v2p1hCrlmm"; version="1.0.1"; sha256="1b29yqsxj8w50zd2giwn1rnz65cd8npf5zgfwbssja36zibds82q"; depends=[]; }; + humanomni1quadv1bCrlmm = derive2 { name="humanomni1quadv1bCrlmm"; version="1.0.3"; sha256="1ahb2rbp9zgaaq7fr41ncd0nnrgpvkagg2ppjmn3kqv7ghjyaiq6"; depends=[]; }; + humanomni25quadv1bCrlmm = derive2 { name="humanomni25quadv1bCrlmm"; version="1.0.2"; sha256="1rhpqj9y57fxzbycyi8spwv0cfqrrsndzsi2lcnf4mfqwklq9hfh"; depends=[]; }; + humanomni5quadv1bCrlmm = derive2 { name="humanomni5quadv1bCrlmm"; version="1.0.0"; sha256="1g4brwdvyxbdkd56i8iy4hhcs8ji82xqdk4wfyn8pkjbb5a183v9"; depends=[]; }; + humanomniexpress12v1bCrlmm = derive2 { name="humanomniexpress12v1bCrlmm"; version="1.0.1"; sha256="0kfx3yjq7mwg97m94sw7w26k0v4523sxjvp2g0p3fmrgqjm6xvf6"; depends=[]; }; + hwgcod_db = derive2 { name="hwgcod.db"; version="3.4.0"; sha256="031y994csc2zfjp2qpki6mzqf4ybb849wn12gbdqphivvpccwm2b"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanWGDASLv3_db = derive2 { name="illuminaHumanWGDASLv3.db"; version="1.26.0"; sha256="0qcr9yx0xxqxmxl0lcl38lnj41nzxd581vp6fyz2y9z8041jar3a"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanWGDASLv4_db = derive2 { name="illuminaHumanWGDASLv4.db"; version="1.26.0"; sha256="0hirbzmfw08b1p3lga00yvfvpnvhij1fayhikc3l9n2sjxkba2xl"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanv1_db = derive2 { name="illuminaHumanv1.db"; version="1.26.0"; sha256="1bd98sskkjqlrshmhkwdhfspyznsjissyk77x373rmq18nb0pjp9"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanv2_db = derive2 { name="illuminaHumanv2.db"; version="1.26.0"; sha256="12pvq269glvk199996s5rcsyzkxyi2ixqrbpdanlw09x5igvfpk6"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanv2BeadID_db = derive2 { name="illuminaHumanv2BeadID.db"; version="1.8.0"; sha256="048znqv200bn5zgikmqzb7dazrys6h5sa1fhybi2x50k203yrslp"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanv3_db = derive2 { name="illuminaHumanv3.db"; version="1.26.0"; sha256="06rsa36lb3nnk2bc65774v7m3r08h7qv6320ax6ib5si2p6wk86f"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaHumanv4_db = derive2 { name="illuminaHumanv4.db"; version="1.26.0"; sha256="11gf6gcbkhvvhca02mbx4rjs07lcnsj6hk0sdqhaczwcwzb4ha1n"; depends=[AnnotationDbi org_Hs_eg_db]; }; + illuminaMousev1_db = derive2 { name="illuminaMousev1.db"; version="1.26.0"; sha256="0w2iziiw8axd1wll3h3vpwn4zr117y5v7c5ji121dh8yzkn1r2ng"; depends=[AnnotationDbi org_Mm_eg_db]; }; + illuminaMousev1p1_db = derive2 { name="illuminaMousev1p1.db"; version="1.26.0"; sha256="1sxqwrc3697361jp69xy9g8w5a699ifjvldqi9ks538h5yc157z1"; depends=[AnnotationDbi org_Mm_eg_db]; }; + illuminaMousev2_db = derive2 { name="illuminaMousev2.db"; version="1.26.0"; sha256="0vwi309ymhrbpa9dyk0fwqy7bfwvvp67q39xjav1s9npi3slv1h3"; depends=[AnnotationDbi org_Mm_eg_db]; }; + illuminaRatv1_db = derive2 { name="illuminaRatv1.db"; version="1.26.0"; sha256="1krpp3pb3h2nrk5jrx54a3v6473qsjnz5wksysy8p4zpisvnxyfb"; depends=[AnnotationDbi org_Rn_eg_db]; }; + indac_db = derive2 { name="indac.db"; version="3.2.2"; sha256="0zyfhq93csg0m58rfvgk42mdczhqgsbmazclcvnm405dka64p18c"; depends=[AnnotationDbi org_Dm_eg_db]; }; + lumiHumanAll_db = derive2 { name="lumiHumanAll.db"; version="1.22.0"; sha256="0kn2m31b4q8r1lm4iwda9i62la4akj0c35pi3khbfvkmdrvbvhd2"; depends=[AnnotationDbi org_Hs_eg_db]; }; + lumiHumanIDMapping = derive2 { name="lumiHumanIDMapping"; version="1.10.0"; sha256="0xm58dggm2m3mb13v8avvji3prgbdxp7jd3lw7xj6hrnw2mghgg6"; depends=[AnnotationDbi lumi]; }; + lumiMouseAll_db = derive2 { name="lumiMouseAll.db"; version="1.22.0"; sha256="00iawk8wb1hnvmy898nl9hc85rfzzwi34lpnv2d37rw4wdn57z33"; depends=[AnnotationDbi org_Mm_eg_db]; }; + lumiMouseIDMapping = derive2 { name="lumiMouseIDMapping"; version="1.10.0"; sha256="18mc7vwp2p53ns2paa4glj570shmbq9lk318g3p9nl09mxyadim9"; depends=[AnnotationDbi lumi]; }; + lumiRatAll_db = derive2 { name="lumiRatAll.db"; version="1.22.0"; sha256="1yh0q8aw33xsn4phj04v0mhjn8xh3z06jrg7yfi9qz1c985z1gw6"; depends=[AnnotationDbi org_Rn_eg_db]; }; + lumiRatIDMapping = derive2 { name="lumiRatIDMapping"; version="1.10.0"; sha256="1d30c3xkxcl8qk68ab7nf8k13m4yb2aqiavhi917yfic1mcbi9gh"; depends=[AnnotationDbi lumi]; }; + m10kcod_db = derive2 { name="m10kcod.db"; version="3.4.0"; sha256="0fqfzjii536xlgpj1z3bgld1269qdh89ynzmrq6l366pj5im0nah"; depends=[AnnotationDbi org_Mm_eg_db]; }; + m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; }; + maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; }; + maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; }; + malaria_db0 = derive2 { name="malaria.db0"; version="3.2.3"; sha256="0rgpifbwfk33h24i4a79968ppfnhfjqn4yfjrdnrzblmyysx9662"; depends=[AnnotationDbi]; }; + medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; }; + medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; }; + mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.2"; sha256="0p19wmdsxqvg5drgdkldnym2p44hyyqpzg8qrzc9d40r4dgdqhi5"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74acdf = derive2 { name="mgu74acdf"; version="2.18.0"; sha256="187k8y1dnnyw926h090gmkk1081sa91fn113lysll3460dqn3ylg"; depends=[AnnotationDbi]; }; + mgu74aprobe = derive2 { name="mgu74aprobe"; version="2.18.0"; sha256="0813s2w5s9ahaqn91mkwzfckclv5jdphq17j2qwyzd4xqyxrmsbi"; depends=[AnnotationDbi]; }; + mgu74av2_db = derive2 { name="mgu74av2.db"; version="3.2.2"; sha256="12zn0wpbzx8bylfpwkfdmjrq8k80phgkv4408ria85vfv7bfakk2"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74av2cdf = derive2 { name="mgu74av2cdf"; version="2.18.0"; sha256="1cw5q8vkmd80g0dxv38qdki39h255bssf27yf0lf0jig9ra5w34n"; depends=[AnnotationDbi]; }; + mgu74av2probe = derive2 { name="mgu74av2probe"; version="2.18.0"; sha256="02wf1xymaxd3hfyrbwxfw12klzf5c28md0h45rf41vzia0mkvr2z"; depends=[AnnotationDbi]; }; + mgu74b_db = derive2 { name="mgu74b.db"; version="3.2.2"; sha256="0r64azjrahdigmgi08qnrcr2m01byp0ggdpbc95a88wvs82zkznb"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74bcdf = derive2 { name="mgu74bcdf"; version="2.18.0"; sha256="0sivgn6srmak7k6p8sj382lsanc34xj5b6182ggnp872y8v6zx5b"; depends=[AnnotationDbi]; }; + mgu74bprobe = derive2 { name="mgu74bprobe"; version="2.18.0"; sha256="0igrdbp2hmn550rcfvrscmvykbpm9sbnfa29walv1v57jy6wl7fl"; depends=[AnnotationDbi]; }; + mgu74bv2_db = derive2 { name="mgu74bv2.db"; version="3.2.2"; sha256="05k89p1wja6y7wjkivq6iwczmq60nm7jk51khksv8204a0vqzlgp"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74bv2cdf = derive2 { name="mgu74bv2cdf"; version="2.18.0"; sha256="05w0dh194lncda9qdkmg52znjrnlnjc15fzplw147nyablq5m109"; depends=[AnnotationDbi]; }; + mgu74bv2probe = derive2 { name="mgu74bv2probe"; version="2.18.0"; sha256="1kn4549s0kj0jpg7yx4lkc8gvxdfm7p21b6yy52ymhfgbv431sl6"; depends=[AnnotationDbi]; }; + mgu74c_db = derive2 { name="mgu74c.db"; version="3.2.2"; sha256="1hsrvppcapjsdny1n9c2bx72zbn65c09dhfxaclglxdfiq9mlfj6"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74ccdf = derive2 { name="mgu74ccdf"; version="2.18.0"; sha256="01dbsxmv7r1r2n348gcdpkxqmciqyrf3s0handp3hl33s6pd8xbj"; depends=[AnnotationDbi]; }; + mgu74cprobe = derive2 { name="mgu74cprobe"; version="2.18.0"; sha256="0ib5iyyp6mms5cszarczs82y2779d3cssz7hih1wm0vddbby40km"; depends=[AnnotationDbi]; }; + mgu74cv2_db = derive2 { name="mgu74cv2.db"; version="3.2.2"; sha256="0yxpcicqm1gj8mkbifmk773l7dp4256m3ms7qn6h13i13qximkqw"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgu74cv2cdf = derive2 { name="mgu74cv2cdf"; version="2.18.0"; sha256="18k1kahfwix3cs6kh2aml2mi39l3vjr526ajksljjk46n0bsf1r2"; depends=[AnnotationDbi]; }; + mgu74cv2probe = derive2 { name="mgu74cv2probe"; version="2.18.0"; sha256="0rx2cigsi4bnm48vl0bbfh6k3k3cs8nv0x7k7j9vq5z9dniyzqf6"; depends=[AnnotationDbi]; }; + mguatlas5k_db = derive2 { name="mguatlas5k.db"; version="3.2.2"; sha256="1pdz7c6z9c6zwwrkl2jbf8cpf5yi0gs68fa0rmf7hs51p89qp7dw"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgug4104a_db = derive2 { name="mgug4104a.db"; version="3.2.2"; sha256="0idqd6w17qjc2krlbv58x63cpdan7w9vviaciy1kmmxg03dqcz2z"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgug4120a_db = derive2 { name="mgug4120a.db"; version="3.2.2"; sha256="01nc39c3kv8rhw4fdwa5b9sa2fhp6hm155kf3sjr1ylas1y5ycf4"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgug4121a_db = derive2 { name="mgug4121a.db"; version="3.2.2"; sha256="1avgvryyyqbghjwk3kiy86dbpn5p6kcdx8h1b3dxzscbyd4s6z1s"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mgug4122a_db = derive2 { name="mgug4122a.db"; version="3.2.2"; sha256="0cg0jg9kmly3kma79aljqxmldjqk35vcjx8yd2hkkip895xlkkcl"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mi16cod_db = derive2 { name="mi16cod.db"; version="3.4.0"; sha256="1v64plvn173hdvjyy491qh2wd4mgbpwr27iq7lab9b3w1g3b1a82"; depends=[AnnotationDbi org_Mm_eg_db]; }; + miRNAtap_db = derive2 { name="miRNAtap.db"; version="0.99.7"; sha256="0h7s83cqr8xwypizdhkgx4nl4pxbr3lhnjwgnwcdibrpq3mbq5cj"; depends=[AnnotationDbi DBI miRNAtap RSQLite]; }; + mirbase_db = derive2 { name="mirbase.db"; version="1.2.0"; sha256="0l7ah1ia7q1h16av2v1qa9nqpr0604z5dlrq37kd0aiz8dcxyddk"; depends=[AnnotationDbi]; }; + mirna102xgaincdf = derive2 { name="mirna102xgaincdf"; version="2.18.0"; sha256="03q71dq6b0plivj5bgpgx0pnqdwfgplakyk5ggj4w7kqwmr5k17i"; depends=[AnnotationDbi]; }; + mirna10cdf = derive2 { name="mirna10cdf"; version="2.18.0"; sha256="146gc1dx071vawn29k2m31zpi3wdwykss4qh8znpmbp5qcja4hyb"; depends=[AnnotationDbi]; }; + mirna10probe = derive2 { name="mirna10probe"; version="2.18.0"; sha256="0f6jfzmj9h4g60lnkdi65grl3ncn19qnrwcxsdhqgiw3ll19cbj7"; depends=[AnnotationDbi]; }; + mirna20cdf = derive2 { name="mirna20cdf"; version="2.18.0"; sha256="05yvi7jibj8fiak7z03gjv07xagpda3gy19namyy4iiq3w7ya2fj"; depends=[AnnotationDbi]; }; + mm24kresogen_db = derive2 { name="mm24kresogen.db"; version="2.5.0"; sha256="0kf9cilhfpfl9cws1b08ic11fnqscdvbja4m16sm4xjyfd2kskfp"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moe430a_db = derive2 { name="moe430a.db"; version="3.2.2"; sha256="14yfpv2ilpw1g4yq1y4bl35x61ldz3lb7m2g95a56fs4cn3149pn"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moe430acdf = derive2 { name="moe430acdf"; version="2.18.0"; sha256="0n4dc2racw68nmfz6arl7f0yh9f3mlkvilsl694zrxw2ysbq1d70"; depends=[AnnotationDbi]; }; + moe430aprobe = derive2 { name="moe430aprobe"; version="2.18.0"; sha256="1paiwgjzlq4c04wy8fpnnxj7n5asiw6z2mz0rjrifja9lgyilq50"; depends=[AnnotationDbi]; }; + moe430b_db = derive2 { name="moe430b.db"; version="3.2.2"; sha256="03wdfg0n66p8q0g1y75zs8aw3gyi756c1ghcw1d4i49qa8h986bq"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moe430bcdf = derive2 { name="moe430bcdf"; version="2.18.0"; sha256="0yl5pkqj37188k2yvvsqhnhm2vx523r11sry976bwzcadlicfhvb"; depends=[AnnotationDbi]; }; + moe430bprobe = derive2 { name="moe430bprobe"; version="2.18.0"; sha256="1nziw3pj4picz0aazblpqkbw82wq3vdajh9i78yfvlz1bwb2vpfi"; depends=[AnnotationDbi]; }; + moex10stprobeset_db = derive2 { name="moex10stprobeset.db"; version="8.4.0"; sha256="0f7xxq0n5c5cp9axaxjmi9dhqfznjiifj98yxz1cgzkihgw7fwry"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moex10sttranscriptcluster_db = derive2 { name="moex10sttranscriptcluster.db"; version="8.4.0"; sha256="0cg16g8i58a2dzkrpa39gjw4cz60ii9d8x4amgwk01j77lbmxwmh"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene_1_0_st_v1frmavecs = derive2 { name="mogene.1.0.st.v1frmavecs"; version="1.1.0"; sha256="00lyakg7dhsm3jkh011mfq1vy439mds64zpm6fgyq592x3k9w2ah"; depends=[]; }; + mogene10stprobeset_db = derive2 { name="mogene10stprobeset.db"; version="8.4.0"; sha256="0z4szr7gxrfqdajzlz38z1l4i87lfwjsidhxa2kp4a5sm0kcpp2y"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene10sttranscriptcluster_db = derive2 { name="mogene10sttranscriptcluster.db"; version="8.4.0"; sha256="1hv7ninsn834if8qwywa033ycf6sifvq3p38h6bkr83gdjzk1pfh"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene10stv1cdf = derive2 { name="mogene10stv1cdf"; version="2.18.0"; sha256="1zhq08zsghck39ly7ymcjanzgw3xy1hqw435hwcrrlipv6i4lbmj"; depends=[AnnotationDbi]; }; + mogene10stv1probe = derive2 { name="mogene10stv1probe"; version="2.18.0"; sha256="1qjnsf6cv23gnqdpcy1xqxy807y91fnaiyh95hg99v932pvika6a"; depends=[AnnotationDbi]; }; + mogene11stprobeset_db = derive2 { name="mogene11stprobeset.db"; version="8.4.0"; sha256="1gvn50r1slchfczhf00ylflpgka11l98rfvi25w6jgm433l2dknq"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene11sttranscriptcluster_db = derive2 { name="mogene11sttranscriptcluster.db"; version="8.4.0"; sha256="0nw9k3wfgssfwrxhw9nnqwjz6vzgrljd1g5gs2bw4f2isa4dzfvn"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20stprobeset_db = derive2 { name="mogene20stprobeset.db"; version="8.4.0"; sha256="1pqf0dqd3apb64cfsmd1rs3vhx76ixf3hx01y4np2khl33spng3v"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.4.0"; sha256="0sbms5rld5x53cjk5yaxl9j37kni37j9drar4a1b94s6cxsh0ydf"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.4.0"; sha256="1nbvq5v114ziqjiijxjji703c30h8fv7f1qvzj1bgr5cssv60bbl"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.4.0"; sha256="111b5pvq4l25wghys2ba9f1g8n5d4y8dqvzi7iivdx17jy61jqm7"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mouse_db0 = derive2 { name="mouse.db0"; version="3.2.4"; sha256="0d0fnn7x9y479sglnjdc0kd5ldv8bgq3d9dd2qy7cw67z1dn7wsv"; depends=[AnnotationDbi]; }; + mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.2"; sha256="0xyzawc9ngwp1z9yzqybq4ywwyngk0c0blkkf5s40jypd77w79pq"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; }; + mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; }; + mouse4302probe = derive2 { name="mouse4302probe"; version="2.18.0"; sha256="11mn9j98m3xfk5sn9cb2r92zckm6acplc66c5xn44nazf29pf9n1"; depends=[AnnotationDbi]; }; + mouse430a2_db = derive2 { name="mouse430a2.db"; version="3.2.2"; sha256="05mi6gxf4pzvl4rcdfxndykzx3563wq4kadhwc5k4zw9g34fllvm"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mouse430a2cdf = derive2 { name="mouse430a2cdf"; version="2.18.0"; sha256="0530znylp4xqld8kak84d6lnc8r62p413d4kkn4j99kmmvx3l9rn"; depends=[AnnotationDbi]; }; + mouse430a2frmavecs = derive2 { name="mouse430a2frmavecs"; version="1.3.0"; sha256="0bb9fqz4kkw78dw9mbkn1pp6wp7lmyqpcg8gdjg9j9aichbqbnh8"; depends=[]; }; + mouse430a2probe = derive2 { name="mouse430a2probe"; version="2.18.0"; sha256="1f7a6mvcpv57h7kfj1qzkcwh7mdl2w9z6ysmrgan9037rd0652sz"; depends=[AnnotationDbi]; }; + mouseCHRLOC = derive2 { name="mouseCHRLOC"; version="2.1.6"; sha256="0xylgnz43xmjnqdwv7pn034wfs61va21lvcpn9igdik2s42ykpp2"; depends=[]; }; + mpedbarray_db = derive2 { name="mpedbarray.db"; version="3.2.2"; sha256="085cg6ap0j7inx5f1vzprlddhpv173sx8886b81fjlx2gq2f440q"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mta10stprobeset_db = derive2 { name="mta10stprobeset.db"; version="8.4.0"; sha256="1chc4ld5g8dmy33vrvprx08yp2vasmr4x6m8bswhfyigzf6n3d6w"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mta10sttranscriptcluster_db = derive2 { name="mta10sttranscriptcluster.db"; version="8.4.0"; sha256="0f890nbnc27hnfazdyyypb3k6sla1ipijb8fvfqfld40nm1is978"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu11ksuba_db = derive2 { name="mu11ksuba.db"; version="3.2.2"; sha256="129zyknqp60whd6g5z85vknjx1h9rv1mdiwbr63rmb2blwcqnl64"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu11ksubacdf = derive2 { name="mu11ksubacdf"; version="2.18.0"; sha256="09xm3ah3zlssclblx663rlwrnmx3niabd5nf7zf7krhbpgcwhyim"; depends=[AnnotationDbi]; }; + mu11ksubaprobe = derive2 { name="mu11ksubaprobe"; version="2.18.0"; sha256="1p3kc06h83ivh06a8qqcbpgbsbdfp9nnwvqfxr6d1gdn15qcp96k"; depends=[AnnotationDbi]; }; + mu11ksubb_db = derive2 { name="mu11ksubb.db"; version="3.2.2"; sha256="0dvajwxbna4q7jd7frrfwnj34mx3gz26b1fkv7a55adsgicfjsad"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu11ksubbcdf = derive2 { name="mu11ksubbcdf"; version="2.18.0"; sha256="1dajsq041pg3g9c5j3sd0w6gypqpdva91rb4a7ni990nk45mg23k"; depends=[AnnotationDbi]; }; + mu11ksubbprobe = derive2 { name="mu11ksubbprobe"; version="2.18.0"; sha256="139kbrlxlw0r4z2iyy4qqcc70sb6nmsn0h7v33k5j6r52qz4hjxh"; depends=[AnnotationDbi]; }; + mu19ksuba_db = derive2 { name="mu19ksuba.db"; version="3.2.2"; sha256="1j2j5hdbhzmys464i35xxws0kkl5fz6ppl8c8win03a8wbkxvadx"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu19ksubacdf = derive2 { name="mu19ksubacdf"; version="2.18.0"; sha256="0c1nhvnnn8v07m6rci2cml6i86rs77b1xnw7jmyndfl458vjlp09"; depends=[AnnotationDbi]; }; + mu19ksubb_db = derive2 { name="mu19ksubb.db"; version="3.2.2"; sha256="1l4ayfl6y3d3nsdnp05kzm3f0fqaa92ayvnnp0wd1idnp5r02dq5"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu19ksubbcdf = derive2 { name="mu19ksubbcdf"; version="2.18.0"; sha256="1waizab2dn74y8b1w27l1yg29gi00v16fij1jm2yhik5cnjhhhk4"; depends=[AnnotationDbi]; }; + mu19ksubc_db = derive2 { name="mu19ksubc.db"; version="3.2.2"; sha256="1fsmkx29vki1g9jcd1hvjil90dhsl5yrxslil4z7xwlvcbzxsjp9"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mu19ksubccdf = derive2 { name="mu19ksubccdf"; version="2.18.0"; sha256="063v3fn06p1znwrdxn26lz7qz9sfzk10hgabimxw3rz5x0580d4l"; depends=[AnnotationDbi]; }; + mu6500subacdf = derive2 { name="mu6500subacdf"; version="2.18.0"; sha256="15y7x1jgzzc366dapa5gy44m98zpn8mfghjxh12k3k9ryd59lxn9"; depends=[AnnotationDbi]; }; + mu6500subbcdf = derive2 { name="mu6500subbcdf"; version="2.18.0"; sha256="0a0w5yldgjvj8pyw7ygn685pj95qdfm34c0sqvgqf7w7g5wm4jvk"; depends=[AnnotationDbi]; }; + mu6500subccdf = derive2 { name="mu6500subccdf"; version="2.18.0"; sha256="1pflw5cpk7ssrg5kjq81gj9z5jafd2mlm6sv4czxbmjpb6038d01"; depends=[AnnotationDbi]; }; + mu6500subdcdf = derive2 { name="mu6500subdcdf"; version="2.18.0"; sha256="0xq4bgkv6iaivz696lz9rrz53dh8gd9zjvqdnz9c06pg7scfv6r1"; depends=[AnnotationDbi]; }; + mwgcod_db = derive2 { name="mwgcod.db"; version="3.4.0"; sha256="0h3ha3d7fml8754ixbd1pgq33jsxl9zivyfmakxy5971b888qiin"; depends=[AnnotationDbi org_Mm_eg_db]; }; + nugohs1a520180_db = derive2 { name="nugohs1a520180.db"; version="3.4.0"; sha256="0r0x8j3safvdncm4s91qircqdcxzyhmq2ad2sf73dcg74pjv0s2w"; depends=[AnnotationDbi org_Hs_eg_db]; }; + nugohs1a520180cdf = derive2 { name="nugohs1a520180cdf"; version="3.4.0"; sha256="1gpa769y27bs4ncicld4994sn6l1h738m1cbv27g58k58r930m1i"; depends=[AnnotationDbi]; }; + nugohs1a520180probe = derive2 { name="nugohs1a520180probe"; version="3.4.0"; sha256="1zyy4w7c2hx790kxa5bv94nijhmk5fb22ps19jbwwqf7r0d2ffhn"; depends=[AnnotationDbi]; }; + nugomm1a520177_db = derive2 { name="nugomm1a520177.db"; version="3.4.0"; sha256="1s3q5hgyz3ikf8bd8c20s6dsl48nymmjz9fwqpq58xrx91sqb7q5"; depends=[AnnotationDbi org_Mm_eg_db]; }; + nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; }; + nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; }; + oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; }; + org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.2.3"; sha256="1zsh3bhnfczihl1bdn7f67bnyf0nm5fbxqxnk34wr4a6c09sb7v3"; depends=[AnnotationDbi]; }; + org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.2.3"; sha256="15im5iv1ba5aqya4r6xjji1yvavklia5m6vam15vi5wniqmmjdr3"; depends=[AnnotationDbi]; }; + org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.2.3"; sha256="0q0lhhx3ffzn32k34bwn4sq7ssjrbszjz5d0nyvw3jqn50fiqs6n"; depends=[AnnotationDbi]; }; + org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.2.3"; sha256="1d0lx00ybq34yqs6mziaa0lrh77xm0ggsmi76g6k95f77gi7m1sw"; depends=[AnnotationDbi]; }; + org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.2.3"; sha256="0a4aiwj1vxjciqqdyc7zmkzk2yxfrp6450hpv8qigb8k3y2l26in"; depends=[AnnotationDbi]; }; + org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.2.3"; sha256="0mib46c7nr00l7mh290n383za9hyl91a1dc6jhjbk884jmxaxyz6"; depends=[AnnotationDbi]; }; + org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.2.3"; sha256="18l8nh6lhprv5l1z3f5nrn6ilbpairmhq5vzql5jp1hs3b3vdnz5"; depends=[AnnotationDbi]; }; + org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.2.3"; sha256="1h11402sg4whsp6xv6ys7yfllhddd1k9cq3q6kgs0c9qr69yx67p"; depends=[AnnotationDbi]; }; + org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.2.3"; sha256="0bdg5k7j8lmr2pqkiz83w5ckk4vddk9kqjlfq0w5igfs6ilr5d4a"; depends=[AnnotationDbi]; }; + org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.2.3"; sha256="1bfhksa7vrdfxqq2yl7a2hsg37qzj8vmaaf1g7vxjk89r3ib6fmq"; depends=[AnnotationDbi]; }; + org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.2.3"; sha256="0xicgkbh6xkvs74s1piafqac63dyz2ycdyil4pj4ghhxx2sabm6p"; depends=[AnnotationDbi]; }; + org_Hs_ipi_db = derive2 { name="org.Hs.ipi.db"; version="1.3.0"; sha256="06nkcjcavzwgnxzmbj05i4dapszf2wq7m5s0g8d6hm7kxz5wxddy"; depends=[AnnotationDbi PAnnBuilder]; }; + org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.2.3"; sha256="0wh1pm3npdg7070875kfgiid3bqkz3q7rq6snhk6bxfvph00298y"; depends=[AnnotationDbi]; }; + org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.2.3"; sha256="037ihry1dly6cb3fhrlfsmcdma6ia6wl9b39c27ayibp9ga6ps0a"; depends=[AnnotationDbi]; }; + org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.2.3"; sha256="1m0adzg66a9rf0m5xf07hzjil0avindaq3wam233gsxwmj91462k"; depends=[AnnotationDbi]; }; + org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.2.3"; sha256="09yf36k3xbzj59c4difik2gkzsxl2rql42g5f1y239j6bigh9mga"; depends=[AnnotationDbi]; }; + org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.2.3"; sha256="1vd6dzz1h6y0znbnxc8ifk929qinr81cglrqbg607xmz87lz1r7i"; depends=[AnnotationDbi]; }; + org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.2.3"; sha256="0cdfbz8qb19rmvzp8lm835waijvwlp7b8dgwkd34diqx4pad4y6f"; depends=[AnnotationDbi]; }; + org_Sco_eg_db = derive2 { name="org.Sco.eg.db"; version="2.4.2"; sha256="1ppjl55059gk9jbh8c8xbsn2jlqz1hm650vm9gxnbd8hpnk63vgz"; depends=[AnnotationDbi]; }; + org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.2.3"; sha256="0n2id4g5ikwlsr2c8qrdv5gmnjycyp40zgwg2xh9ml9ahpzx957s"; depends=[AnnotationDbi]; }; + org_Tgondii_eg_db = derive2 { name="org.Tgondii.eg.db"; version="1.0"; sha256="1vq3qbk6jswfffj5lfwsic71h8ga7a6gqf6wfa7qcda3gvfhnwlc"; depends=[AnnotationDbi]; }; + org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.2.3"; sha256="1l7i0wv89bd6f4var4qakjxz4frnrzm88frjcfac3kba98196pva"; depends=[AnnotationDbi]; }; + paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; }; + paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; }; + pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_2006_07_18_hg18_refseq_promoter = derive2 { name="pd.2006.07.18.hg18.refseq.promoter"; version="1.8.1"; sha256="09593qkh3jqlgxlqrpl3gla3y1kcshnzlq6nf10xhlps0qdlskhx"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_2006_07_18_mm8_refseq_promoter = derive2 { name="pd.2006.07.18.mm8.refseq.promoter"; version="0.99.3"; sha256="14cm7z1y7rsk5m2zazg27wvjabckb9ifwa1g091ckwn1jfaf7aqn"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_2006_10_31_rn34_refseq_promoter = derive2 { name="pd.2006.10.31.rn34.refseq.promoter"; version="0.99.3"; sha256="0v0fa1hn5bwa15vg31dar2x0xfki0xby6qf5p1a0ivrx3pnvbsrl"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_ag = derive2 { name="pd.ag"; version="3.12.0"; sha256="0kh7ridgihqpibazpxpf9y8qiznxm4nng39701abamadxb5r6qmq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_aragene_1_0_st = derive2 { name="pd.aragene.1.0.st"; version="3.12.0"; sha256="0255bgsqz8fflnlnxw77wvv6rky46n3pcryk9yhw7nfx0cq19v4r"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_aragene_1_1_st = derive2 { name="pd.aragene.1.1.st"; version="3.12.0"; sha256="105qfxg8p9z0bzffm6zg16c5f6nnv5hddlpcxs0kp3daddap8h5s"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ath1_121501 = derive2 { name="pd.ath1.121501"; version="3.12.0"; sha256="0j83s6402xrggnlnqjyphy577by9w1ncvf1az4immzaixdamaaxc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_barley1 = derive2 { name="pd.barley1"; version="3.12.0"; sha256="0mha6w2zh7gi4y7ngkh84jaff50h8l9a0q9dwc8a00m5npkpkv4g"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_bovgene_1_0_st = derive2 { name="pd.bovgene.1.0.st"; version="3.12.0"; sha256="00ys19pdc7zgprfrhmk0pzfb5q96qy0vqxi2a6g28pxwf3367b30"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_bovgene_1_1_st = derive2 { name="pd.bovgene.1.1.st"; version="3.12.0"; sha256="0npjm9rpcwj5j8sh1mdr5j1fz7dbwrqvjh2jx69fpslry69i6daq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_bovine = derive2 { name="pd.bovine"; version="3.12.0"; sha256="1g03za5jc8lz21wpx1h2rcxdwsx7ddmmnyflz46z35ginzy41g7h"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_bsubtilis = derive2 { name="pd.bsubtilis"; version="3.12.0"; sha256="07x4dss0zp3p315q38bi7xarycav2hr44x7jb1jx4dypr0jh98mh"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cangene_1_0_st = derive2 { name="pd.cangene.1.0.st"; version="3.12.0"; sha256="0dcwy6gnlj51hkc2gsv6fdq02vczci4z37f3iy1n8zkvz5b4yw6c"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cangene_1_1_st = derive2 { name="pd.cangene.1.1.st"; version="3.12.0"; sha256="0pgw1424rvg3k9m3z6ffiyfj91i930dx2slqd15bnvc9hrr75094"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_canine = derive2 { name="pd.canine"; version="3.12.0"; sha256="0xpisxv7c990w44gd5g2iwfzqi3618xa3mdps69z2j4bfrcm37vq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_canine_2 = derive2 { name="pd.canine.2"; version="3.12.0"; sha256="1dx914yyq6ry88d6fipsxsvp41pgcgllznpwsqqm2xa99y85ka5y"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_celegans = derive2 { name="pd.celegans"; version="3.12.0"; sha256="08byc5xvnbfdlikv9118k52pk37br4k8hn86xypkrmbz67fzlzpd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_charm_hg18_example = derive2 { name="pd.charm.hg18.example"; version="0.99.4"; sha256="0nqv3h4zp83vp7q49n956920x5hdfcbw4z3hlvmqx8dixbgr1jrg"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_chicken = derive2 { name="pd.chicken"; version="3.12.0"; sha256="1alkhr297ar6iv7nrjxnlhmq3xvjzpl46mdckkbxw13w73vj6p32"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_chigene_1_0_st = derive2 { name="pd.chigene.1.0.st"; version="3.12.0"; sha256="0smfgx1brfla96ijsv3a3ljcn02kpbk6sczgp06dik3g0k54788h"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_chigene_1_1_st = derive2 { name="pd.chigene.1.1.st"; version="3.12.0"; sha256="013baf38h35fsxq0f32v00rizik8iq76jm1s8azkicv90bvw5g8k"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_chogene_2_0_st = derive2 { name="pd.chogene.2.0.st"; version="3.12.0"; sha256="0pljjz466y2aav9045qgr5hbrv7alyl3gw3br4a8knbijk6fbw15"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_chogene_2_1_st = derive2 { name="pd.chogene.2.1.st"; version="3.12.0"; sha256="0d9pslimh0w37yvvfgqljbr2z5arjn6kx0wnjhp19gcch44jvkr2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_citrus = derive2 { name="pd.citrus"; version="3.12.0"; sha256="1792gsxdr24264n121zvspdq39ac3khaghv5j66rn2nzqds75qch"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cotton = derive2 { name="pd.cotton"; version="3.12.0"; sha256="1h71klvndi32j7hb7cy2w6asf7lb1xhs5glxajnd30y7ksigba7l"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cyngene_1_0_st = derive2 { name="pd.cyngene.1.0.st"; version="3.12.0"; sha256="1xkv8m346x1zrnp4bhbjk2xwfq5jkbprbh417bya8swqvcyv3zbj"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cyngene_1_1_st = derive2 { name="pd.cyngene.1.1.st"; version="3.12.0"; sha256="1kicrk0n2lik32q9nkpfy8ydh8klsy6i5cy6m2grddv80g5hc6n4"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cyrgene_1_0_st = derive2 { name="pd.cyrgene.1.0.st"; version="3.12.0"; sha256="1s7rrwcmaar230y90hhvrx3wxlp228j88pwdh2glap2pn3d3rlnd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cyrgene_1_1_st = derive2 { name="pd.cyrgene.1.1.st"; version="3.12.0"; sha256="0p7j8ygyx8f5aqyy847rfcc35hrkcavi1700af971jjrha3gllc0"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_cytogenetics_array = derive2 { name="pd.cytogenetics.array"; version="3.12.0"; sha256="0gd7q64zfxda9irdmmr92iqxlswaj5v4pklsfm96xkn8lxq34dlb"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_drogene_1_0_st = derive2 { name="pd.drogene.1.0.st"; version="3.12.0"; sha256="1zp85q3a2bayr0q5r0ij62kfypzngcz9v791xsf9n9k7nx6714fi"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_drogene_1_1_st = derive2 { name="pd.drogene.1.1.st"; version="3.12.0"; sha256="0yjxjzmcx2hh6rm15p9d36vfj77fwmd7q2kbjk8h7hbpkm72ssdf"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_drosgenome1 = derive2 { name="pd.drosgenome1"; version="3.12.0"; sha256="1cp3fs2g88yv50gkd6m769idlj7kci2g82wafn17ci65g64q0g05"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_drosophila_2 = derive2 { name="pd.drosophila.2"; version="3.12.0"; sha256="0rr3l6203nfzhz21wps7dfcifvzmbnixcr2piv5jdfh7birj23aa"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_e_coli_2 = derive2 { name="pd.e.coli.2"; version="3.12.0"; sha256="1nny0w0adg433n1i20q0jdmi5yy1anpa91dgrklpvxyxbr5902vz"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ecoli = derive2 { name="pd.ecoli"; version="3.12.0"; sha256="0mi5i0cp5xz97pb3ic6qmwl3fp4byyddvas2npll4ngarl5wv5ag"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ecoli_asv2 = derive2 { name="pd.ecoli.asv2"; version="3.12.0"; sha256="19pn7691cr0vakxlx0q0x3p1pfc0z8l5f14475bv2fr4djljhhma"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_elegene_1_0_st = derive2 { name="pd.elegene.1.0.st"; version="3.12.0"; sha256="1if8gwvvk9jybsrcwr8sayg1czchpnlmysa9plrm50g7r2ki7m4l"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_elegene_1_1_st = derive2 { name="pd.elegene.1.1.st"; version="3.12.0"; sha256="18v3n3ss3rl2ksvjg1jk1w0mprhhxra55znixfcd8ikqsrdfj2a2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_equgene_1_0_st = derive2 { name="pd.equgene.1.0.st"; version="3.12.0"; sha256="01vcj6a6hm9j2fbhrz244sbig63j1jyxyg068q4hizpl9lpzaibd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_equgene_1_1_st = derive2 { name="pd.equgene.1.1.st"; version="3.12.0"; sha256="0migyzmrgqvvnkl8w61qv26hj5kjy720q4ipamdn99z9s4r8cxrn"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_feinberg_hg18_me_hx1 = derive2 { name="pd.feinberg.hg18.me.hx1"; version="0.99.3"; sha256="1k50khs7mrp1qy9z0whm5drwv59m8zn7v0zxhv26bpvmwbrnlhfg"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_feinberg_mm8_me_hx1 = derive2 { name="pd.feinberg.mm8.me.hx1"; version="0.99.3"; sha256="1xk4rmpxjh9mwijwglzlycg7bk2zk599fk7xbnk114rj216y2jsm"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_felgene_1_0_st = derive2 { name="pd.felgene.1.0.st"; version="3.12.0"; sha256="1lf3lp3zjprfwni2nfdpkvj2j6y7hd7znmxqcgj46vccznc49hh6"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_felgene_1_1_st = derive2 { name="pd.felgene.1.1.st"; version="3.12.0"; sha256="027cgqxfgmlkx64y6nm9h36ji781fkrnnrdxblh8h4jwjd5n36rj"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_fingene_1_0_st = derive2 { name="pd.fingene.1.0.st"; version="3.12.0"; sha256="0l19h920cghw65nqbh79s1rwijqdl7k84km0iv1fgx0kxhh28xa0"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_fingene_1_1_st = derive2 { name="pd.fingene.1.1.st"; version="3.12.0"; sha256="1habbw9fvygailw73azfrvczgp6ap1az688vz8pklqq77vlqs1qz"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_genomewidesnp_5 = derive2 { name="pd.genomewidesnp.5"; version="3.14.1"; sha256="1kiqmcc07q2m7hkgqczqndk7frpwibpsi2c0ihr5av0vjrp118ak"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_genomewidesnp_6 = derive2 { name="pd.genomewidesnp.6"; version="3.14.1"; sha256="1f35nw987axlc5rsr97i7rwcy1dd8zjjj6jf4cg75y0la6rvhfw4"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_guigene_1_0_st = derive2 { name="pd.guigene.1.0.st"; version="3.12.0"; sha256="1rq5gbdm6k0shv82zy7vrqxahzffh1xikrd3a6d1ai67n129bv6f"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_guigene_1_1_st = derive2 { name="pd.guigene.1.1.st"; version="3.12.0"; sha256="0p53kkhaa4d6ib32sfnwvs363zir227dmzxp8yqma0z4kz0djdna"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hc_g110 = derive2 { name="pd.hc.g110"; version="3.12.0"; sha256="014bb45m2pwwbz7aca6l6442188mkp5bsk46z7x18g0aa66p06hv"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_focus = derive2 { name="pd.hg.focus"; version="3.12.0"; sha256="1qlkhxq76nb55c299g7x7x8wn8nx1mg4ra5b0faflsjirkh4b32s"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u133_plus_2 = derive2 { name="pd.hg.u133.plus.2"; version="3.12.0"; sha256="02ip0mf24lw818ij8xgk7cylb5q1059jwvbdd2aynqqwy2mg31h0"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u133a = derive2 { name="pd.hg.u133a"; version="3.12.0"; sha256="08bk5im2zkb1vif1i6bgfx068xcl5q5m0ac33zpscfdq4jashm7k"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u133a_2 = derive2 { name="pd.hg.u133a.2"; version="3.12.0"; sha256="1rlh62r5zmxllkc9izr6a4yr2n88flfz1rybwvi90yggc788chxy"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u133a_tag = derive2 { name="pd.hg.u133a.tag"; version="3.12.0"; sha256="1ndjzcydshh5f3cnrav91hi47bx92z6rqliiwirhx2cqk8bvz5yp"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u133b = derive2 { name="pd.hg.u133b"; version="3.12.0"; sha256="1mafh53bj6g30869pdyl59040m2crqqbfcbdpdxfpigxpqr3rb4c"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u219 = derive2 { name="pd.hg.u219"; version="3.12.0"; sha256="04kqvh5ilf83z2iwvfw7m8xsgjxy29vqayp1lgh38y48j0nn24dk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95a = derive2 { name="pd.hg.u95a"; version="3.12.0"; sha256="1c7d16im1xxs8v0ccn19klwv43qr6b4iw0k5hz9cl8m10jmyw49b"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95av2 = derive2 { name="pd.hg.u95av2"; version="3.12.0"; sha256="1l3y2bhjk67jwxvxwn5rngzn5c2dzk4lk24cm74f6px845qw5sk7"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95b = derive2 { name="pd.hg.u95b"; version="3.12.0"; sha256="0gyxh7nagya1hgh5vvwalxmhbqm9pii3l6h1mndvx2ib58msh49h"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95c = derive2 { name="pd.hg.u95c"; version="3.12.0"; sha256="0p9yrwjw75r5dg3z0pl4yr04agjpqv9rz3in2faw3pqawdzndihq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95d = derive2 { name="pd.hg.u95d"; version="3.12.0"; sha256="0ygfx73b122b468zvr9lhw2vkr1aijasrazarqjqc8bjbfm4fybw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg_u95e = derive2 { name="pd.hg.u95e"; version="3.12.0"; sha256="0cksi811m9fzjq5linlsarfswp3p7rdgks0js3chv91jr3v2z3a7"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hg18_60mer_expr = derive2 { name="pd.hg18.60mer.expr"; version="3.12.0"; sha256="1lsfsgsj6gyv0q509d0axr6g2yv226zxqh8f2n1hw0kfxwl27bm8"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ht_hg_u133_plus_pm = derive2 { name="pd.ht.hg.u133.plus.pm"; version="3.12.0"; sha256="1000f1d28yzc0kcdf380fkx3xlgla3kn4n9f2ddawzjb7igash92"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ht_hg_u133a = derive2 { name="pd.ht.hg.u133a"; version="3.12.0"; sha256="14bnnxsn02mpyynn8bvl8c47id9l2wfakngbvpq4h5yjy689jm1c"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ht_mg_430a = derive2 { name="pd.ht.mg.430a"; version="3.12.0"; sha256="10shsap47217p6zmb9fn86na7if965h45l2r787cisgyyn9n45mq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hta_2_0 = derive2 { name="pd.hta.2.0"; version="3.12.1"; sha256="0564lbkyxs2lvj6pcz5p9p19p5jxlywk7iiva0qfmb7pbmairk7k"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hu6800 = derive2 { name="pd.hu6800"; version="3.12.0"; sha256="07dj0avpx53kwaab9s126pn844nal9kn3h288n1m0kihir2mrjmv"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_huex_1_0_st_v2 = derive2 { name="pd.huex.1.0.st.v2"; version="3.14.1"; sha256="1chlvjy1gvw5r8hfmkb34m3h7w2z4s5x9gsc50qbj84988k4gzga"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hugene_1_0_st_v1 = derive2 { name="pd.hugene.1.0.st.v1"; version="3.14.1"; sha256="1ikd6h7wnyxm11j0had2wcsxfbfrwdfw9605bvvdgd63dlvdv5dk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hugene_1_1_st_v1 = derive2 { name="pd.hugene.1.1.st.v1"; version="3.14.1"; sha256="0bsvwr4h8j4niagnmf7d2jd714dqk4yzdhr664z6vpx6429s0rsw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hugene_2_0_st = derive2 { name="pd.hugene.2.0.st"; version="3.14.1"; sha256="02m5x9mrz4ca0w84ljmdpw7rnlzqbqdq0q5k4sg7izx99k5c8r59"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hugene_2_1_st = derive2 { name="pd.hugene.2.1.st"; version="3.14.1"; sha256="07la78206cvilfm8l2fwrcyy3gpwnhn0p32ilv043ln9drka2r8h"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_maize = derive2 { name="pd.maize"; version="3.12.0"; sha256="02viqnqf02d75sbarxh1k76966yay5i6wwdx118s4c9nlr5q6aqg"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mapping250k_nsp = derive2 { name="pd.mapping250k.nsp"; version="3.12.0"; sha256="10j8c18glhvg07zp6w84hlc6l3a3qkvcvfnq0blpjfdk3a2lndz7"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mapping250k_sty = derive2 { name="pd.mapping250k.sty"; version="3.12.0"; sha256="1hpyijrkr6svxxhrdp6s4jjcvr44hhbrdhrzvnw5ywpykmbphryc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mapping50k_hind240 = derive2 { name="pd.mapping50k.hind240"; version="3.12.0"; sha256="1whpjdr4aql846cm8nzgs613pi12qdqfixhqcfv8wrqyks27kq6s"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mapping50k_xba240 = derive2 { name="pd.mapping50k.xba240"; version="3.12.0"; sha256="1a1f3lh5ywhyjawdbj2fzban85c8jz70lfcv3pagd5piincjwxq8"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_margene_1_0_st = derive2 { name="pd.margene.1.0.st"; version="3.12.0"; sha256="1s4l57hw511cnzj197jvvzqs8ymfbf14khxcv4llg55prxnvvnfc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_margene_1_1_st = derive2 { name="pd.margene.1.1.st"; version="3.12.0"; sha256="067jv9486win2kv563gr4vpc96lpl02zqd09cnma7ycd7l1nvj9s"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_medgene_1_0_st = derive2 { name="pd.medgene.1.0.st"; version="3.12.0"; sha256="0f5blbhlp160av6r37icjdq2lyrvip09r4yzxhfa2vlxpcm7i83m"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_medgene_1_1_st = derive2 { name="pd.medgene.1.1.st"; version="3.12.0"; sha256="1mlyv6qjcxj9q416pmjq36q0aqp5l47pkd557ayaqd7gm3ygikcq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_medicago = derive2 { name="pd.medicago"; version="3.12.0"; sha256="1wm81jr9d04yiyg0alj197fjigcvjhz2kvh8j6jw9yaawppr0c5p"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74a = derive2 { name="pd.mg.u74a"; version="3.12.0"; sha256="1jji6g49icsxyam9qx3mbaspg24q0hjavi0w75k99m2ckmllc47c"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74av2 = derive2 { name="pd.mg.u74av2"; version="3.12.0"; sha256="08ym915fb26qbz2r9kzgf7znai4mc06lr59l1da0x02iaixagg32"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74b = derive2 { name="pd.mg.u74b"; version="3.12.0"; sha256="0yav9ghdk8y12bsqam2r0p4q3r1yymfwrz1kdg0l7qfzw3mn141d"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74bv2 = derive2 { name="pd.mg.u74bv2"; version="3.12.0"; sha256="0hxczlax8qnghp4f7d3ph2y5j3vz3k4iwl6lyw3sig51msl4q6sd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74c = derive2 { name="pd.mg.u74c"; version="3.12.0"; sha256="13sq8jmwlqrci87bnl313dyqzy6v141r3fqzh1frl1w66ilw9chm"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mg_u74cv2 = derive2 { name="pd.mg.u74cv2"; version="3.12.0"; sha256="1s59s9ch1ynrmnsn5jl2b19phij4qamgcpfs3f5zhji6ip41lckj"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mirna_1_0 = derive2 { name="pd.mirna.1.0"; version="3.12.0"; sha256="0klkmrljgvkqvdlm07c47bl0jppbzz95ikxabfi8b3ajv78k6gn1"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mirna_2_0 = derive2 { name="pd.mirna.2.0"; version="3.12.0"; sha256="12ynrrr0jrc0kl6s4pkn9fv3r3bh6wsbrfyywb5bvxf71n75wnqy"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mirna_3_0 = derive2 { name="pd.mirna.3.0"; version="3.12.0"; sha256="0awghps8nlisdj2anvs400dn1hwdi8iw6xlrw17qr70fznbihdsy"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mirna_3_1 = derive2 { name="pd.mirna.3.1"; version="3.8.1"; sha256="0g8fjwhxmps1w5f7lvnv258qn2ipggs1ar4r810amqqxd0yd5ah2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; + pd_mirna_4_0 = derive2 { name="pd.mirna.4.0"; version="3.12.0"; sha256="000gqhcvlpydrpr61853q22x8gvzmlf1kp7w98lll5g1vvwkw1ad"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_moe430a = derive2 { name="pd.moe430a"; version="3.12.0"; sha256="15qys3pm8nwkr385y8mj976k16as8r65lmzykm8cy0skl071i8wb"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_moe430b = derive2 { name="pd.moe430b"; version="3.12.0"; sha256="1xas3ld65xp2g1cfkd1n4v3yvx3g0g221c3ag550k552v0alfbyd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_moex_1_0_st_v1 = derive2 { name="pd.moex.1.0.st.v1"; version="3.14.1"; sha256="13bqzbyqngbhj7yji568cc36fq0zw0bjaglfp2n9nnhdddd8b62x"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mogene_1_0_st_v1 = derive2 { name="pd.mogene.1.0.st.v1"; version="3.14.1"; sha256="1hmb8kf91jd9q6b4pxiwlaj6ajzmkv1c3xsszyps5cwv13pgdjix"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mogene_1_1_st_v1 = derive2 { name="pd.mogene.1.1.st.v1"; version="3.14.1"; sha256="13s7r8g29y56qbj2xm81r5kj65y2qcp5d24bakbhfcvz60wzljqf"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mogene_2_0_st = derive2 { name="pd.mogene.2.0.st"; version="3.14.1"; sha256="0205jk6x8r35bmma771q6km631jlppm4y72zy85bv87dv4adxci8"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mogene_2_1_st = derive2 { name="pd.mogene.2.1.st"; version="3.14.1"; sha256="14qwcq6yyy2ayrqv8kr33chlpgw3vkgq8iwb3yycsh3x3wz40jb8"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mouse430_2 = derive2 { name="pd.mouse430.2"; version="3.12.0"; sha256="1ix7vkjy175cxbsbs67z38dhszxjik6370j0jkfpcknms6bh1db3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mouse430a_2 = derive2 { name="pd.mouse430a.2"; version="3.12.0"; sha256="11ywfshqxjmwf9q4sj97zv3ylynfkswcfaqglj883p4719lhxmc3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mta_1_0 = derive2 { name="pd.mta.1.0"; version="3.12.0"; sha256="07vznamds5lc1xnpv7kjwcrsd5zq0ap4gk8a85xqb93fmcc9ypqi"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mu11ksuba = derive2 { name="pd.mu11ksuba"; version="3.12.0"; sha256="10fkys7y5b5frdrjqw3x2gqzp51lgg29nw6gxz25yi5fznc3nnv2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_mu11ksubb = derive2 { name="pd.mu11ksubb"; version="3.12.0"; sha256="08734j3asq56v090zi0gzk3ryycjm78dfbb0xqmpr7ggqys96qp9"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_nugo_hs1a520180 = derive2 { name="pd.nugo.hs1a520180"; version="3.4.0"; sha256="1qc87zrrccld1hdqmrk1if98c6jq343gzlmib40wvshmrijp3sk3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_nugo_mm1a520177 = derive2 { name="pd.nugo.mm1a520177"; version="3.4.0"; sha256="0568zvxc11w2i32wimhmi4271jbmpn97kb0vn4ns20hfg4h63m99"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ovigene_1_0_st = derive2 { name="pd.ovigene.1.0.st"; version="3.12.0"; sha256="0vga20rb0v4yzd28szsppbgfhmn6ky85qrjj9llvacnlj1riwxsi"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ovigene_1_1_st = derive2 { name="pd.ovigene.1.1.st"; version="3.12.0"; sha256="1vzrizvk1dbj6ngjxv9wpbm89q5mr8dkfhr0azrczs54c92xy48r"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_pae_g1a = derive2 { name="pd.pae.g1a"; version="3.12.0"; sha256="0b0bmzfrh7lm2i5d66z24iz0d5zj3qhw89aw011yssks7sr9lq90"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_plasmodium_anopheles = derive2 { name="pd.plasmodium.anopheles"; version="3.12.0"; sha256="0njd97jkg4hxd0jyq03227i00gmy0ccxznzqmp0mjqmkkhljn7nm"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_poplar = derive2 { name="pd.poplar"; version="3.12.0"; sha256="0j5xmf5hqvbb8ylsrvih92vxn1c1lah3mkffn64fji2lgqy9vjp9"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_porcine = derive2 { name="pd.porcine"; version="3.12.0"; sha256="0zx2gz90hhalaas3sf2rh8wcapjwmnckr0gq1r8p572chwf2rb81"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_porgene_1_0_st = derive2 { name="pd.porgene.1.0.st"; version="3.12.0"; sha256="1jiajzn31yjzs942w3i4cjqlpq81rkbryk961fqb9jpwldzg1pmy"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_porgene_1_1_st = derive2 { name="pd.porgene.1.1.st"; version="3.12.0"; sha256="038zwlckx58bw4x5naspfnvk4jcyc2g9bijrh1wd4m4k5mr1i4dk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rabgene_1_0_st = derive2 { name="pd.rabgene.1.0.st"; version="3.12.0"; sha256="0vwxzwgwh1a0fpyqsc3mnagin67wf2jmymm9kwhcnxargpmslm7k"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rabgene_1_1_st = derive2 { name="pd.rabgene.1.1.st"; version="3.12.0"; sha256="0qs3ka3pdlrpqh66zb62jdfm2y6p2wyn6rcp7gb5qw0s8q9h170a"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rae230a = derive2 { name="pd.rae230a"; version="3.12.0"; sha256="14kb35pcgxh2hmpzyqp9c2xirs0p6y5dvc3h2n568jmmdd14s7j5"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rae230b = derive2 { name="pd.rae230b"; version="3.12.0"; sha256="1db6bm6qyrzwwa2scyw6qg7qcdqq97s5vy8kv0fnqc604b1jdzzq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_raex_1_0_st_v1 = derive2 { name="pd.raex.1.0.st.v1"; version="3.14.1"; sha256="11sxhhpb4fy7wh5k7yxwwv141xgn4r1yshx097wicpa6561ffdkc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ragene_1_0_st_v1 = derive2 { name="pd.ragene.1.0.st.v1"; version="3.14.1"; sha256="0afnv1f5xvdh1vdsdfi5k1zscqzpdbf4b399wib3c8dg9vslccgx"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ragene_1_1_st_v1 = derive2 { name="pd.ragene.1.1.st.v1"; version="3.14.1"; sha256="1krygwjhqs97gyh94xfbsfd8gg285fg5bgm7rqk7wlwp8fxx8xnn"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ragene_2_0_st = derive2 { name="pd.ragene.2.0.st"; version="3.14.1"; sha256="1rq4ivv107853pyr4jrnbms4fgfzddndibrasgql9d4msca0sbz9"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_ragene_2_1_st = derive2 { name="pd.ragene.2.1.st"; version="3.14.1"; sha256="1k9zqhnck7fgp6g0b8vmasqjvdyqshzs567rz8qabw6jk5ifssvz"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rat230_2 = derive2 { name="pd.rat230.2"; version="3.12.0"; sha256="0ysn0qi26b3llqs312an0mlgyahf4pgmixlcq2x2n925drns34gg"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rcngene_1_0_st = derive2 { name="pd.rcngene.1.0.st"; version="3.12.0"; sha256="0hrhvy6dbw8g1h9qgm9frpmfp45pd5h0fnbvbvz94l98a5gda7xx"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rcngene_1_1_st = derive2 { name="pd.rcngene.1.1.st"; version="3.12.0"; sha256="1lyizr096x5idasvlivl3lb67g7n2xvblrk5zfxglaf2fgpbrgwn"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rg_u34a = derive2 { name="pd.rg.u34a"; version="3.12.0"; sha256="18jl5w1say8zyp50iqmd6jiw8ffa7qsk6sw7h7cw0j1g90ssf4y3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rg_u34b = derive2 { name="pd.rg.u34b"; version="3.12.0"; sha256="19v2g9lvadvba2dy0c0qn6j8qnsds2xa4cliiq12byad21833ss0"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rg_u34c = derive2 { name="pd.rg.u34c"; version="3.12.0"; sha256="10j3hcszx637dfd55552b75qni0yryrjk8q6p0wkd5dh6p628qrx"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rhegene_1_0_st = derive2 { name="pd.rhegene.1.0.st"; version="3.12.0"; sha256="1mx221xvxr4ng01ibq1pc472bn5rknfv3sjsbvvfmvqgpwk6z079"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rhegene_1_1_st = derive2 { name="pd.rhegene.1.1.st"; version="3.12.0"; sha256="0f400qal4qmkxv705n5bzz07rkrz5zgs7swk8xp4pyp161fgb171"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rhesus = derive2 { name="pd.rhesus"; version="3.12.0"; sha256="1zrpq7ppl2gaiprvz4sm0zsxqcw2nvn6qzwi3b0cimqf7r2091dd"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rice = derive2 { name="pd.rice"; version="3.12.0"; sha256="0fmd505vianfspb1s5glr6aacnz45dq9skbk1qwm0a9ck6a6paav"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rjpgene_1_0_st = derive2 { name="pd.rjpgene.1.0.st"; version="3.12.0"; sha256="18qj6sdjw17553lwcb3swdx0aiv54izdzzblgl88g90ijny8rbpa"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rjpgene_1_1_st = derive2 { name="pd.rjpgene.1.1.st"; version="3.12.0"; sha256="0i99fyf6ya13z4hfjf3f5ssvys8wjhmwk894zy0p59p7nmphigyc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rn_u34 = derive2 { name="pd.rn.u34"; version="3.12.0"; sha256="0ayp6r7z7p61b1lfq9dkq4ips4apgjg6igrcnvsivlfhcfcfs0wf"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rta_1_0 = derive2 { name="pd.rta.1.0"; version="3.12.0"; sha256="0kchpv8j55k07gm42sbpsw5mpg47cfj4m0jw8i70wbrhj866bilp"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rusgene_1_0_st = derive2 { name="pd.rusgene.1.0.st"; version="3.12.0"; sha256="1ik28yykkpdclr5hrv8lzafzfivakwvzgz49q7bpb1g6ihwylshw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rusgene_1_1_st = derive2 { name="pd.rusgene.1.1.st"; version="3.12.0"; sha256="090lxwxzj39d6qzlr7c3x50zf98g8x987rv1gdn0gcas15imya6n"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_s_aureus = derive2 { name="pd.s.aureus"; version="3.12.0"; sha256="0kszw94ymxgwd3midzkpl307ch3pyr4g5qjcf4s2jsq6mrvxw666"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_soybean = derive2 { name="pd.soybean"; version="3.12.0"; sha256="0xg90m7k1x9sgmhcp1qdwhxsyr2y5g28p7a4z6gd6mng2l7cgyh0"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_soygene_1_0_st = derive2 { name="pd.soygene.1.0.st"; version="3.12.0"; sha256="1hg90pma4ikdgxpw1f5mkjcw7na4mmjbhpr06dcssjl3bvmd4yxc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_soygene_1_1_st = derive2 { name="pd.soygene.1.1.st"; version="3.12.0"; sha256="0978vbl59afgrzy0cmwq4mhsdz5rn5d929nz90fvczm6q8g24616"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_sugar_cane = derive2 { name="pd.sugar.cane"; version="3.12.0"; sha256="09m8m99l9mrhs4gr1rb02l54k8i2wgdzz88qlbpl4xmrfnfn99h6"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_tomato = derive2 { name="pd.tomato"; version="3.12.0"; sha256="12jn8i691j3kkgwa771f4kffzfcxv19vi0waw13akch7x7cc09q7"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_u133_x3p = derive2 { name="pd.u133.x3p"; version="3.12.0"; sha256="171rv9syn90k70ivaj8c48s827c08nycpyyc2b76jy405kaqb1gl"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_vitis_vinifera = derive2 { name="pd.vitis.vinifera"; version="3.12.0"; sha256="19r2k7wx3kygw6syqph24glw0b273gpi0z0y8n4bnd3a184g6hxz"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_wheat = derive2 { name="pd.wheat"; version="3.12.0"; sha256="12n8k5ah8fncbrb2hrpi2ah29fj5rxnh5j5zk8lfwhijg2zf52ra"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_x_laevis_2 = derive2 { name="pd.x.laevis.2"; version="3.12.0"; sha256="0zf3rc8rz05hzga2g5b8khszz6sr29dlp8z1jyn94ial284d0fn3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_x_tropicalis = derive2 { name="pd.x.tropicalis"; version="3.12.0"; sha256="1pb6jm14k0g4z9vffi3clyh7rwc11c89hinb2amczg4xfm5lqrdr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_xenopus_laevis = derive2 { name="pd.xenopus.laevis"; version="3.12.0"; sha256="1fxd95ak5s2dw16prxdwk20hisss32nywy9dc7y72bpqrv0v309y"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_yeast_2 = derive2 { name="pd.yeast.2"; version="3.12.0"; sha256="0l6sxg79xmlb7gdxx4bx24l35jgx5y2qfp3pxzcmdnd7c7qy6z5j"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_yg_s98 = derive2 { name="pd.yg.s98"; version="3.12.0"; sha256="1krx7kkjlyc41739c349z0sdbslp19iqfai0xzy6f4jk15524vhj"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_zebgene_1_0_st = derive2 { name="pd.zebgene.1.0.st"; version="3.12.0"; sha256="1vywph8shn23k0s8jmvx34rj34y1zxgwcssjnzbipm71f2sa15hw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_zebgene_1_1_st = derive2 { name="pd.zebgene.1.1.st"; version="3.12.0"; sha256="0xs3kx7l78dfqkasgz8n5s8qjia5qhdcnj1l8al0ivy8mwvlpyxs"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_zebrafish = derive2 { name="pd.zebrafish"; version="3.12.0"; sha256="0gg7y7w51pv0vf39qzyaf09wl3vxy222nr69zgxg7cylwxmaky7v"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pedbarrayv10_db = derive2 { name="pedbarrayv10.db"; version="3.2.2"; sha256="1rvzg08d6b04d21hx4xsa3qdgdp7xndkkyi3yd7k8ilanpidi8jb"; depends=[AnnotationDbi org_Hs_eg_db]; }; + pedbarrayv9_db = derive2 { name="pedbarrayv9.db"; version="3.2.2"; sha256="1f8p1zapw74afch0bmn7j96296d88qwxx6p0qa1xf7ir8q92fl3x"; depends=[AnnotationDbi org_Hs_eg_db]; }; + phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.2.0"; sha256="07hpsghl8j4xs3601vd6vf1a1v1q5dn35kmih424cxwh1vhb5yyb"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.2.0"; sha256="14isvvv22y040qj3lbal0vf15l0k7c1r7jql27rl98f4n11hl1pc"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.2.0"; sha256="0vpally7hwh7snqcz005g9z0iabi545cqg8bgrg9970w29j4xrgk"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + pig_db0 = derive2 { name="pig.db0"; version="3.2.3"; sha256="0kn1l48pwfc2bgmxck90fq9n2dayjzmdsj6rz44q02a4c5c2m6kz"; depends=[AnnotationDbi]; }; + plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; }; + plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; }; + poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; }; + poplarprobe = derive2 { name="poplarprobe"; version="2.18.0"; sha256="1pi6lhkk3lr49qs0yfpxm80nm1zqn4syykydymah2208r6qnkgv2"; depends=[AnnotationDbi]; }; + porcine_db = derive2 { name="porcine.db"; version="3.2.2"; sha256="1xbgvzhywv504xyd2kciixrcg9dr6c99czxclf0rwwl7dwyadwr1"; depends=[AnnotationDbi org_Ss_eg_db]; }; + porcinecdf = derive2 { name="porcinecdf"; version="2.18.0"; sha256="1ywbgh5nk3bba0mhmbbmvry0j9m9vk7qmsacl5nx1cjd7kp68csv"; depends=[AnnotationDbi]; }; + porcineprobe = derive2 { name="porcineprobe"; version="2.18.0"; sha256="16q865wjrfcm5ffqwjdk762yq1ixa93jlvfg7xbhsvajvvw5dxdy"; depends=[AnnotationDbi]; }; + primeviewcdf = derive2 { name="primeviewcdf"; version="2.18.0"; sha256="0qj3l2iabpl2d79pr258cbqar4hdpjkbwf829bnwrmabkaq92z48"; depends=[AnnotationDbi]; }; + primeviewprobe = derive2 { name="primeviewprobe"; version="2.18.0"; sha256="0kw04789ihxnw874qcdj5ypwj6npya2v3p893ahjwhys5wrivmqg"; depends=[AnnotationDbi]; }; + r10kcod_db = derive2 { name="r10kcod.db"; version="3.4.0"; sha256="073b5fb8dcqp5iq3h6p6250l91z6bzg72nzl7qva3jin33v96nmm"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rae230a_db = derive2 { name="rae230a.db"; version="3.2.2"; sha256="095d2jf1g89855y7fmv6v8fpwk6gir2b1v5s7sj4xdry8ax67l0v"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rae230acdf = derive2 { name="rae230acdf"; version="2.18.0"; sha256="1f62gw18mhmrm4sqc3kazsm5zd4m73f99xzxbakqhvr5sbdqh28k"; depends=[AnnotationDbi]; }; + rae230aprobe = derive2 { name="rae230aprobe"; version="2.18.0"; sha256="0gkpaa53znqsmi3366wfmqz6q3d1cq3ymag09gkpdmssrp1rh9qh"; depends=[AnnotationDbi]; }; + rae230b_db = derive2 { name="rae230b.db"; version="3.2.2"; sha256="07nb27lhwabdh3yxirpnvgvym6wqal40xi105nmn5y6mr5a1q2yg"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rae230bcdf = derive2 { name="rae230bcdf"; version="2.18.0"; sha256="1j2i49cp042nk3rkf8q6gxcnwd5cihz1nyg8r6yndkja51r41pi8"; depends=[AnnotationDbi]; }; + rae230bprobe = derive2 { name="rae230bprobe"; version="2.18.0"; sha256="1smqs93fks4rd5g9kk7cacnpsnj4rjr0d6fl2i01mdiihfi3csny"; depends=[AnnotationDbi]; }; + raex10stprobeset_db = derive2 { name="raex10stprobeset.db"; version="8.4.0"; sha256="004h4z10x84w9bk71y1a22r51hh52xhpvdr1flr6crgxvhh0icis"; depends=[AnnotationDbi org_Rn_eg_db]; }; + raex10sttranscriptcluster_db = derive2 { name="raex10sttranscriptcluster.db"; version="8.4.0"; sha256="1ndjr34s6bbaa6bl6922asw90hnyzllm5w2bd7n0vxasgjl434fq"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10stprobeset_db = derive2 { name="ragene10stprobeset.db"; version="8.4.0"; sha256="1gqvgcgvnqhgibava8rp1izz2fgncpdyw2qm5hkxqkkw3gy7kf8p"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10sttranscriptcluster_db = derive2 { name="ragene10sttranscriptcluster.db"; version="8.4.0"; sha256="1sbda37zh5p7dx2rsgfa2mjc3yrrskzp2cpgdk5vi1m94lqs651w"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10stv1cdf = derive2 { name="ragene10stv1cdf"; version="2.18.0"; sha256="0fm2yj6nn3v1wiscjb53hm4ylh5cgxvs7qgc9sbsbpv7agr0bzng"; depends=[AnnotationDbi]; }; + ragene10stv1probe = derive2 { name="ragene10stv1probe"; version="2.18.0"; sha256="0cb3a908hixcakl41ay4yyfm9r97ln8gjidn4rs1hr7qaplfj1mh"; depends=[AnnotationDbi]; }; + ragene11stprobeset_db = derive2 { name="ragene11stprobeset.db"; version="8.4.0"; sha256="023md8y6wmfxa6cmj6ld1j22g48xc9clbibixm4zx73av9qjjm47"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene11sttranscriptcluster_db = derive2 { name="ragene11sttranscriptcluster.db"; version="8.4.0"; sha256="1lqypb7s4jifgga2fzk0q6662m28yn4qkw0axcbal2hqn37rsm30"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20stprobeset_db = derive2 { name="ragene20stprobeset.db"; version="8.4.0"; sha256="1hi6zq13l9vjimppmp3y6bznbwh08l0g1wcfva0ihgyw0mj5klwc"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.4.0"; sha256="18v7f7i6r9byq5sjr9pxshqmbr6p2iym3gv95lqqfg4qlgiri991"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.4.0"; sha256="0qfhb9fpydfh9n0d41pky46zsjabg7cpmyg6m59v529s22xw1mhw"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.4.0"; sha256="04cm1248iphl4n7avjr29ac44kgvhj8fkwxvb5wsyrjdfs15swmm"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rat_db0 = derive2 { name="rat.db0"; version="3.2.4"; sha256="1yxamdcfgj0imjbj54hvwjyz0s5739654qf9c934ykrkfmfacrl0"; depends=[AnnotationDbi]; }; + rat2302_db = derive2 { name="rat2302.db"; version="3.2.2"; sha256="1m9kn3lx1kydglk503ila814v9rrd2sphhhyqdvw9cp4jd4d22c0"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; }; + rat2302probe = derive2 { name="rat2302probe"; version="2.18.0"; sha256="1zwjgbcb9d4ib6z1iyjz8x11lq0b5gqs08y6j3idb5wf3i2p521v"; depends=[AnnotationDbi]; }; + ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; }; + rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; }; + rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; }; + reactome_db = derive2 { name="reactome.db"; version="1.54.1"; sha256="0nqv0yyhlnkn75zrj5chpmxcf2ak3bddffjkfwnm740hr7cn0491"; depends=[AnnotationDbi]; }; + rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.2"; sha256="03p2qfg1bxpc6hd3g3j4hpndcb89id8ygkkn3za4gbbc4xql6543"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; }; + rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; }; + rgu34b_db = derive2 { name="rgu34b.db"; version="3.2.2"; sha256="1gckh80vjabrhwxnzqxr885z6jzmpmvd1lqpa430b6nmjffgq0fn"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgu34bcdf = derive2 { name="rgu34bcdf"; version="2.18.0"; sha256="1iw0jydcjizkxybpbimcc9m8rjl4xm3jx431nvr28h14948jhrg3"; depends=[AnnotationDbi]; }; + rgu34bprobe = derive2 { name="rgu34bprobe"; version="2.18.0"; sha256="097q0994fbn05b6iprncynpka9zm9ayh1pmjya44lj4ahfmflgiq"; depends=[AnnotationDbi]; }; + rgu34c_db = derive2 { name="rgu34c.db"; version="3.2.2"; sha256="0rhiqkgpr5fkjndbqgibrg8kcxxav0ijz3cfd1gflk0530q816sk"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgu34ccdf = derive2 { name="rgu34ccdf"; version="2.18.0"; sha256="0v6glasybwg73synvlq6rf3fw4wckavp09waf3g3hya4qzy45r1x"; depends=[AnnotationDbi]; }; + rgu34cprobe = derive2 { name="rgu34cprobe"; version="2.18.0"; sha256="00v9hbq5vc6ah4gws196isglicxj1dpzp1a0vv4pkl2ph59hkf1q"; depends=[AnnotationDbi]; }; + rguatlas4k_db = derive2 { name="rguatlas4k.db"; version="3.2.2"; sha256="02a3y3ysi7v9jlv2h22yj2lqy96x9szrliz0bvs5zz12jmmkv4rg"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.2"; sha256="0kxlhh14v8ygscxaym56302fpnl91ski5hzrdz2cinsp71p9zm08"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.2"; sha256="0z0cf5an7c6m5prkssyc5jsxxmsljpn71wgf2z54gdl8k5nq7gli"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.2"; sha256="0fhq9wmq9r5h4hzv0d33xc6ld6grcmngvydnr3lm325x97fpyfjc"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rhesus_db0 = derive2 { name="rhesus.db0"; version="3.2.3"; sha256="0qfnhvn6v3ip6y10jcb7xnsv8v9y2madrynaga0giqxghdj87rki"; depends=[AnnotationDbi]; }; + rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; }; + rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; }; + ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ricecdf = derive2 { name="ricecdf"; version="2.18.0"; sha256="07lsw9rklk2rsvbkcj1ci8hg2x68k3qpkx9yw0cmd7rg5fvydgns"; depends=[AnnotationDbi]; }; + riceprobe = derive2 { name="riceprobe"; version="2.18.0"; sha256="0w6qvszdmnipn3v2bld46x7my2a9hni0jbxd0y1d6xcrrgs951ra"; depends=[AnnotationDbi]; }; + rnu34_db = derive2 { name="rnu34.db"; version="3.2.2"; sha256="1mhnazgbczf9bkdx20hyyfzk5kc4a71g4i9b7b5rcw99jpaabs3b"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rnu34cdf = derive2 { name="rnu34cdf"; version="2.18.0"; sha256="1snb89530zxdbsfs1vgw30b1wdc5sdr1q46bmvz5m9g57gyficr0"; depends=[AnnotationDbi]; }; + rnu34probe = derive2 { name="rnu34probe"; version="2.18.0"; sha256="1rzjha1v453fxiwqs2zgwcbrvz6w96biz2jny0hrh5s86d5f6xpb"; depends=[AnnotationDbi]; }; + rtu34_db = derive2 { name="rtu34.db"; version="3.2.2"; sha256="16kf4h4dfhjk0m8ks3r76j9ca6qinzh2sh6258ba887gdy63rd78"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rtu34cdf = derive2 { name="rtu34cdf"; version="2.18.0"; sha256="10f5wnvk820c8brl2qqs7mv6jcn1v6pmz680kvlpyz9s2sz16936"; depends=[AnnotationDbi]; }; + rtu34probe = derive2 { name="rtu34probe"; version="2.18.0"; sha256="0mcp9lmc65j3ds73gyak72pkshnx6km0d2cm324yaxlp9bqzfchw"; depends=[AnnotationDbi]; }; + rwgcod_db = derive2 { name="rwgcod.db"; version="3.4.0"; sha256="1k0fpnv314lx2jf3mm6xfqa3jx353sp42awxqys9byzhg9zyj2j3"; depends=[AnnotationDbi org_Rn_eg_db]; }; + saureuscdf = derive2 { name="saureuscdf"; version="2.18.0"; sha256="0vmm3fy10dzzmaq22ah4fb0k3fs1gdbhnsi8mxz7xgp27dcan29j"; depends=[AnnotationDbi]; }; + saureusprobe = derive2 { name="saureusprobe"; version="2.18.0"; sha256="0s5ma3hh7ncsi4dq33r3hwffk85x3gvjbm5cslppbsd0r0bjwkia"; depends=[AnnotationDbi]; }; + soybeancdf = derive2 { name="soybeancdf"; version="2.18.0"; sha256="1dlwxdslm827661z6f4z2hwr7wpwqfzvizhvv63p86ll7l6gs3s8"; depends=[AnnotationDbi]; }; + soybeanprobe = derive2 { name="soybeanprobe"; version="2.18.0"; sha256="06dpwqad7q3wyq0bsgpwkw8kx1gq5fy1s1lw632xrvgcid2fsmf8"; depends=[AnnotationDbi]; }; + sugarcanecdf = derive2 { name="sugarcanecdf"; version="2.18.0"; sha256="0wghc6wr7iwkql63m3wibjjdcdpqd53z0g5rxdh553sjb0ca2n7z"; depends=[AnnotationDbi]; }; + sugarcaneprobe = derive2 { name="sugarcaneprobe"; version="2.18.0"; sha256="17zrydd8xd7m61bp750xlpcak0m3zgl0mvknz9s7mv2a35kp02ih"; depends=[AnnotationDbi]; }; + targetscan_Hs_eg_db = derive2 { name="targetscan.Hs.eg.db"; version="0.6.1"; sha256="1p14jyhn1d2m6kww9vsb96263g8crnrff7qgyiz46pp9ww8mvxf4"; depends=[AnnotationDbi]; }; + targetscan_Mm_eg_db = derive2 { name="targetscan.Mm.eg.db"; version="0.6.1"; sha256="0ad6vxpwn9x82qcrpwcy1lwg0q3ik4vabxn01k6gwmbpvydz9cf5"; depends=[AnnotationDbi]; }; + test1cdf = derive2 { name="test1cdf"; version="2.18.0"; sha256="0nmkrp4b2p09pg8ndcnfv5y7w94xah6fa5pff60dp1s2s8dcgcr4"; depends=[AnnotationDbi]; }; + test2cdf = derive2 { name="test2cdf"; version="2.18.0"; sha256="0hr8y7s0vvg6dzridwj2qh4kmsn24lq7km28pipn9m4iyis0i2hw"; depends=[AnnotationDbi]; }; + test3cdf = derive2 { name="test3cdf"; version="2.18.0"; sha256="0954g4qk52f53c34gl4x5dmpcm1dia5dl6vyr20vxz6ffpmqdb4h"; depends=[AnnotationDbi]; }; + test3probe = derive2 { name="test3probe"; version="2.18.0"; sha256="005s4sags80zkd6hvndqlcr6vxsbxgbdwilsrrjbwpw27w9yvymg"; depends=[AnnotationDbi]; }; + tomatocdf = derive2 { name="tomatocdf"; version="2.18.0"; sha256="1ldq5pxzh2vms5nbhn3aiy55hx2x3zbzy9wlbf2v2wczwlzbiinm"; depends=[AnnotationDbi]; }; + tomatoprobe = derive2 { name="tomatoprobe"; version="2.18.0"; sha256="1aj8zmpla9b9p7pj0qnp2jqrj7azp1nmfvjcbka5ns5vrnvfpf92"; depends=[AnnotationDbi]; }; + u133aaofav2cdf = derive2 { name="u133aaofav2cdf"; version="2.18.0"; sha256="052hs4lwllq0p0fsx5d1ixqhrdl889k14z10kahpsjn60746qarm"; depends=[AnnotationDbi]; }; + u133x3p_db = derive2 { name="u133x3p.db"; version="3.2.2"; sha256="0inmx2ssi7iafgf5smhszplrq1d149vcd9ddpfqy14q84fpxm6yc"; depends=[AnnotationDbi org_Hs_eg_db]; }; + u133x3pcdf = derive2 { name="u133x3pcdf"; version="2.18.0"; sha256="05bdb5bz1ffv7dhbzn0s5ybygah72zvhz8zcj8bn9dg0k40yqsrb"; depends=[AnnotationDbi]; }; + u133x3pprobe = derive2 { name="u133x3pprobe"; version="2.18.0"; sha256="0xzm6dkf78mp1yhdl3w0hg36saxgb4sxnq0dsvzjmfaca74ir2qy"; depends=[AnnotationDbi]; }; + vitisviniferacdf = derive2 { name="vitisviniferacdf"; version="2.18.0"; sha256="027nn1fr5zixnlikw4pi704kdfrfm388j5qr30y9bsky445fn7g4"; depends=[AnnotationDbi]; }; + vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; }; + wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; }; + wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; }; + worm_db0 = derive2 { name="worm.db0"; version="3.2.3"; sha256="1wq82jvax97w1aqr6la9arzrqw81jwkvzj2fmq5fj6l9bkizh5a4"; depends=[AnnotationDbi]; }; + xenopus_db0 = derive2 { name="xenopus.db0"; version="3.2.3"; sha256="061nkbc90xa1hy26alshihs3gvl9qwqmfv05kc8gci9c15wp7k7k"; depends=[AnnotationDbi]; }; + xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; }; + xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; }; + xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.2"; sha256="0pak2v29wf0lns8n8nx04p15vcs351vr1sr0arybffp15maw3lya"; depends=[AnnotationDbi org_Xl_eg_db]; }; + xlaevis2cdf = derive2 { name="xlaevis2cdf"; version="2.18.0"; sha256="1w7f6z5f0mfgblfjy840dxj3y1l9zz8fp4s8q6zd580nwaa50g78"; depends=[AnnotationDbi]; }; + xlaevis2probe = derive2 { name="xlaevis2probe"; version="2.18.0"; sha256="0vrhbzi3myh10v7r5a6jqiinllns3n40nxs097px7g80x8ajkmb2"; depends=[AnnotationDbi]; }; + xtropicaliscdf = derive2 { name="xtropicaliscdf"; version="2.18.0"; sha256="03plnc0dya0dgmvay3hyw5yi91ris6gl643chmjil7p8vn9lb5as"; depends=[AnnotationDbi]; }; + xtropicalisprobe = derive2 { name="xtropicalisprobe"; version="2.18.0"; sha256="02z376zy7bqdghbfqqs6h62icfzq26k4aap5ks4hb745i4hrpgif"; depends=[AnnotationDbi]; }; + ye6100subacdf = derive2 { name="ye6100subacdf"; version="2.18.0"; sha256="0pkiw0lh4p2ng0rf9n0d589yasdx7mbw0srn5drdqyr5qwi9wfis"; depends=[AnnotationDbi]; }; + ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; }; + ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; }; + ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; }; + yeast_db0 = derive2 { name="yeast.db0"; version="3.2.4"; sha256="1y1p2987w480nr2mdvkyag8ixhxf15y5h5awk69kpq5qvpd73q2y"; depends=[AnnotationDbi]; }; + yeast2_db = derive2 { name="yeast2.db"; version="3.2.2"; sha256="0wgfpnsc8mpizag8x2mpyf0hj00k3fwsfz6nws7fnrndqhc47ixb"; depends=[AnnotationDbi org_Sc_sgd_db]; }; + yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; }; + yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; }; + ygs98_db = derive2 { name="ygs98.db"; version="3.2.2"; sha256="07qkrv7c17h0h851402pf7rvlf00izm8f3s5bjpyagnjpzbxxyd4"; depends=[AnnotationDbi org_Sc_sgd_db]; }; + ygs98cdf = derive2 { name="ygs98cdf"; version="2.18.0"; sha256="0j04biahbm2l31aayddp0z9rh3jq1ydxf3h8pxr3pvq2vjj1q2mh"; depends=[AnnotationDbi]; }; + ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; }; + ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; }; + zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.2"; sha256="1hx6x2ninchkyw4gmw4frzs0j7zj8lbh880q6wvvzf76a414lka2"; depends=[AnnotationDbi org_Dr_eg_db]; }; + zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.2.4"; sha256="0y5i2rb5vskpal3kchk8c5wywynvaz9dacb9hggk03qkrbpz03bn"; depends=[AnnotationDbi]; }; + zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; }; + zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; }; +} diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix new file mode 100644 index 0000000000000..4ae4806a6836b --- /dev/null +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -0,0 +1,266 @@ +# This file is generated from generate-r-packages.R. DO NOT EDIT. +# Execute the following command to update the file. +# +# Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix + +{ self, derive }: +let derive2 = derive { rVersion = "3.2"; }; +in with self; { + ABAData = derive2 { name="ABAData"; version="1.0.0"; sha256="1p2q03c87ilwfz7gbypkfi0n3m9m3c4z6ci9b5v4pr46q4ppl7s9"; depends=[]; }; + ALL = derive2 { name="ALL"; version="1.12.0"; sha256="1k4sx1ras9g9zbx34r5nxyrik5c5jzb4b1zxf4551q5xfy97w354"; depends=[Biobase]; }; + ALLMLL = derive2 { name="ALLMLL"; version="1.10.0"; sha256="0c1ma3lzh1dvmz7h1pw0r9vvq9y0xmc1hjm0lwr3ql509lim82aw"; depends=[affy]; }; + ARRmData = derive2 { name="ARRmData"; version="1.6.0"; sha256="1bn41pmk7mfdncjnd103spfdcxrwz5jgdycb37kgq1hk36qzw3mj"; depends=[]; }; + Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.6.0"; sha256="03gb68gw3q6aig3r510h9rwlhj4g40n1dsic2iyj5cs9fmj6gfq1"; depends=[]; }; + Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.4.0"; sha256="1bzc53gcazsl3958nnq3igy4xrd693gl9gsrz48zaj47gwij2la0"; depends=[]; }; + Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.8.0"; sha256="0cm5giv12p3cx3z0ync7pgj309n4xy630y9wr70pb7n9kr0f5gjf"; depends=[]; }; + AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.8.0"; sha256="1cag2mc81qcqx8gwlg4xyvm4a6qayjajwdna8mcwki42gjdl15x4"; depends=[]; }; + Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.8.0"; sha256="0ajxf81y3w6r60gj6ybkzqn7qcqrwch1s10nd2jcv7ki4w6vw6kb"; depends=[]; }; + AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.10.0"; sha256="1xpkdllg9a86pc4fjfiv9a0n8mbiaxyz3ra40v9drwh29skkfpm2"; depends=[affy]; }; + AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.0.0"; sha256="1jz69nxilwcs9h7hj366dl20fxlblrgvplnjjr091r5jy3a43cvj"; depends=[]; }; + BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.8.0"; sha256="0vszzx44sppd0gka884fm53al9ljpjl4rrzq7li4w23ndf8sf5ak"; depends=[beadarray GEOquery limma]; }; + CCl4 = derive2 { name="CCl4"; version="1.8.0"; sha256="0wmkkvxb2k0x921djf7x08svkm6lxfy00053ba572zk9rgb1pzqf"; depends=[Biobase limma]; }; + CLL = derive2 { name="CLL"; version="1.10.0"; sha256="1r9iv4m993nz7rj6z23pclgd4c8j75d5raq2518vjkp1a4prhj4s"; depends=[affy Biobase]; }; + COHCAPanno = derive2 { name="COHCAPanno"; version="1.6.0"; sha256="0dayg8p92ma2bwjn4c342q03z1cmb8xyazr4c8y8pzddrydwaizv"; depends=[]; }; + COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.6.0"; sha256="045fh1g0m6z47q5smc2x7q3adfxs50fa3ph0k9b3qrkrzfq4dpcb"; depends=[]; }; + COSMIC_67 = derive2 { name="COSMIC.67"; version="1.6.0"; sha256="0ixjr4r3rj4q0mhv3nkvl4f9h6a4p0zhb90byri9w9jwskzm41h1"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; + CRCL18 = derive2 { name="CRCL18"; version="0.104.0"; sha256="1k3xk588a6jm4cifpaljciwfhwwgz1f7wigwlsi06mqnxic6d545"; depends=[Biobase]; }; + CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.2.0"; sha256="0whrczwqlni05iifra614mi2s9a9byj8gzi9dzh85947nxvvky67"; depends=[Cardinal]; }; + ChAMPdata = derive2 { name="ChAMPdata"; version="1.8.0"; sha256="0f8b7zf90avxl9siz4289m91yp21w4bk5hjw6rpkl2w2wvgcz6a1"; depends=[]; }; + ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.8.0"; sha256="0n3v9d4dbdwbjr01sn4gbys521wmqsnfdg2hbfs0fhp9kajrh9ya"; depends=[bigmemory]; }; + ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.8.0"; sha256="08p3n2ds4fxwbh0xp19z7p6qf7p07h87hxlcfnvsf0vzi8ifp146"; depends=[affy hexbin limma qvalue statmod]; }; + ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.6.0"; sha256="05gbp5gnqmdpc3yk1mbd7vj3phy1kjyimvndrc7ijvnmcg7dzs9m"; depends=[]; }; + CopyNumber450kData = derive2 { name="CopyNumber450kData"; version="1.6.0"; sha256="1scg0mij4rpgb4sfk7fzrd3yxryglnj94gv5dgj6k2gw1551xiyh"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.2.0"; sha256="1snbk048xigzskajjcm3ihm0cj9yb57h79ac91cmlpqkac6bvpsg"; depends=[]; }; + DLBCL = derive2 { name="DLBCL"; version="1.10.0"; sha256="0nmhm768cpfq8kzhc0x33yqdaw9zi7n0vzgaw2qb1f89dr0bwvm4"; depends=[Biobase]; }; + DMRcatedata = derive2 { name="DMRcatedata"; version="1.6.1"; sha256="1fd6wsg7v89iknwnpf0ypxwvpz5kl6dzwm74dsrn179fm2wxjqjm"; depends=[GenomicRanges]; }; + DREAM4 = derive2 { name="DREAM4"; version="1.6.0"; sha256="1plla7jzqarwcanyb2ss330y9ssmrr6ka6fa6040r1z0y64c12qj"; depends=[SummarizedExperiment]; }; + DeSousa2013 = derive2 { name="DeSousa2013"; version="1.6.0"; sha256="18yanbz9nnaxsxgnydvr55xw95aymk2l32fad3xzh2fb1lb3wmqm"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; + DmelSGI = derive2 { name="DmelSGI"; version="1.2.0"; sha256="0cxzw6fb3gwp46j3gc59ygiaghv4wi3dx2dbljbq9f5csnfwdr9y"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; + DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.8.0"; sha256="1s50gkjvsradqrjz47xlpzxrl1xad52g07ww75vyrgk0pqdczcgr"; depends=[EBImage]; }; + DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.6.0"; sha256="1n4nmcynm9g86n33x4ndgja8c1qkk940z9dgl15y47plyc4xx1mv"; depends=[]; }; + DvDdata = derive2 { name="DvDdata"; version="1.6.0"; sha256="1vzxlaa5481w70cy9ihmm2xk9hn7l4hwvi663i6fgjc1dzramvql"; depends=[]; }; + ELMER_data = derive2 { name="ELMER.data"; version="1.0.0"; sha256="19v1vy16ppz1nc9s4586qvsz70d1jq7cx5rj4ravnd6kwvnk12xr"; depends=[GenomicRanges]; }; + EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.8.0"; sha256="0dh37fdd8y2fnr0mf7c8jxizmpgd4xb51l1wyvbrc47iqb068g33"; depends=[GenomicRanges rtracklayer ShortRead]; }; + FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.6.0"; sha256="1s077sdz9szxzva3js1qcm5p64yy56bxjcxsf474k12n39ax5bx5"; depends=[]; }; + Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.6.0"; sha256="1q020k3iaf74cipyj4dz3qqi1007nnjhpgqf143axqzl9p7cy9f1"; depends=[Biobase gplots limma VennDiagram]; }; + Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.6.0"; sha256="0vwdklxshkpsv3wi69j7m1vdjl556zw6hxzak0jcnf60m4hmyxj2"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; + FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.8.0"; sha256="1g3jd0wihx2nw5hfjmpv3vgragkgx0nwh3j2f2fl2zdbkiaawf7j"; depends=[minfi]; }; + FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.6.0"; sha256="1xk67dxwmpiraidfmr1k6qqbfi1fnpzsr35rn4khiwh6frsyvw0d"; depends=[minfi]; }; + FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.6.0"; sha256="15f3b6p5gr25pfrnzsd90w9dnajryia66scpd4jfrws8jagccszq"; depends=[IRanges rtracklayer]; }; + GGdata = derive2 { name="GGdata"; version="1.8.0"; sha256="1r2kshwi8iajk0rwzkccdw389ffvkzivg82f4bri3xw0sq57fm50"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; }; + GSBenchMark = derive2 { name="GSBenchMark"; version="0.104.0"; sha256="133myyzjs6ybj0p7vmrz6xbrc21xid50351pyrd2hm8xrry8h7sa"; depends=[]; }; + GSVAdata = derive2 { name="GSVAdata"; version="1.6.0"; sha256="1aldm4mjzdfwnfplrr0nd115w9s877xq1glm1lv60y7dbcki0ghd"; depends=[Biobase GSEABase hgu95a_db]; }; + GWASdata = derive2 { name="GWASdata"; version="1.8.0"; sha256="1spphp552kajq80q630bwq9ynjfb0abl97fhkfgqi312xiyz8hs8"; depends=[GWASTools]; }; + HD2013SGI = derive2 { name="HD2013SGI"; version="1.10.0"; sha256="004d5j2pfrjll68qdswpla81vl6n91vq3jq5rqpc4dwsbgxwaziy"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; + HEEBOdata = derive2 { name="HEEBOdata"; version="1.8.0"; sha256="04s7jdlhls5rzyaczdar8qzln008c97fh5a51mysxw8d53cj2qd9"; depends=[]; }; + HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.10.0"; sha256="0smdnfvv8gmccxa648lh5smz2cb157bsh823kcwbb49hlm3m1mp9"; depends=[]; }; + HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.104.0"; sha256="0d3vigzcrdx0jk9bb27xn7zkz61jgfwsljw0xgsncq1r34v3jrmm"; depends=[]; }; + HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.104.0"; sha256="1l5xlfjlg619acc8sr8c3mm89cyqnkaicscmjbz6iir2zvprx0qm"; depends=[]; }; + HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.6.0"; sha256="04a9mqs7xfvyk8604g936hrgpfrq26xhi717caf32jh8hl2aaq82"; depends=[]; }; + Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.6.0"; sha256="1pqahziip8rxmnx2vpylxlfj7g21f051d13f7if4p5wgdkyy1n96"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; + ITALICSData = derive2 { name="ITALICSData"; version="2.8.0"; sha256="042axcyf4g5m5b7yl97x36n69jr3rhir3bxghpxw0xc6cbxq047g"; depends=[]; }; + Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.6.0"; sha256="10a082khw646qsqalijks35x7if997181phqw66p2gg9iy2pq0w3"; depends=[]; }; + IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.8.0"; sha256="1p6wh8y51jnz61akk5n03aklph4gh5xbkzy30mnk2gassfgd7psp"; depends=[]; }; + Iyer517 = derive2 { name="Iyer517"; version="1.12.0"; sha256="193q80789jd4afgij6pzw86pccwfg1hyyr88yc5vmvh922g94iw0"; depends=[Biobase]; }; + JASPAR2014 = derive2 { name="JASPAR2014"; version="1.6.0"; sha256="17xnxqbwv073qsyimhrsssc32xcsi2v3kh4s2qzy8is3snv560ff"; depends=[Biostrings]; }; + KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.104.0"; sha256="125bhkzjva7xw5zys3ahqr0qig67yms1w37zh86bcf7x2wm88ky2"; depends=[Biobase BiocGenerics]; }; + KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.8.0"; sha256="05hzmszj7dpyb6ahkxic7ykxvc57zvdfv844yss4m0a217mymglz"; depends=[Biobase BiocGenerics]; }; + LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.8.0"; sha256="0884yzyn79sfbr4wbv8vjq5ivvvk21l1r273w2sqbqay41kakrkj"; depends=[IRanges KernSmooth]; }; + ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.2.0"; sha256="12ycbz6iiq0byfvc3f3y9vfafqpskys3wycmjsiym2xscmvhqdnw"; depends=[methylPipe]; }; + LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.6.0"; sha256="04srfy56sb015iprc4r634dkabvq44fhhl7i8j9q9llg1bl43q06"; depends=[]; }; + LungCancerLines = derive2 { name="LungCancerLines"; version="0.8.0"; sha256="18alyl6hlcnx5qwakssfwqkl2aigjmcbrvxax3k9h1pvi3hwp2vf"; depends=[Rsamtools]; }; + MAQCsubset = derive2 { name="MAQCsubset"; version="1.8.0"; sha256="0dz9qnnnri2zx8iy1hshyssmq4ry16194n5gbq7j7db9c56i5ymb"; depends=[affy Biobase lumi]; }; + MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.8.0"; sha256="0kp9p51v0c3025d74gx64qpyxhgc0rrdp5li0x2jvihyjgd1wz4r"; depends=[affy Biobase]; }; + MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.8.0"; sha256="0a9mihv039f45n6h8isc834nmckcxhailah5lqmgca6lz7hclnpf"; depends=[Biobase lumi]; }; + MEALData = derive2 { name="MEALData"; version="1.0.0"; sha256="19k7fppx41v3lwrbm13d9wni7z1hjaxms14aap00ffwpwzs6f0z5"; depends=[]; }; + MEDIPSData = derive2 { name="MEDIPSData"; version="1.6.0"; sha256="1jq48li4m8ha4alfhqh7aqkrd18sk4fr1qb7vrhahqhb5q7s4vg9"; depends=[]; }; + MEEBOdata = derive2 { name="MEEBOdata"; version="1.8.0"; sha256="140p9h1f3zg5dm8nqs9hqwydlw58qzs32my2d4zmzzk6g41bj5pc"; depends=[]; }; + MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.6.0"; sha256="111830m6mzc0dlvqpq4ixi1zrfkp66vhj9i3433kyp9mw2d7mnc4"; depends=[]; }; + MSBdata = derive2 { name="MSBdata"; version="0.8.0"; sha256="10yngdppq6706jmvd8i00l01mva8757aavfmz8mmvcyi5cggz200"; depends=[]; }; + MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.104.0"; sha256="00j2sgljvqpimd574k1v8apbnsb7sja79alwxq2mk26y96zh76a9"; depends=[]; }; + MethylAidData = derive2 { name="MethylAidData"; version="1.2.0"; sha256="0qyvppw5p0akqkxk26b955gjn15rikxyvxmkwd4qrv4pbxbc1crp"; depends=[MethylAid]; }; + Mulder2012 = derive2 { name="Mulder2012"; version="0.10.0"; sha256="1dlk8nrvpfk4byii5yssss016yz3qc8ndldgj44p97bqs4nfnjb4"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; }; + NCIgraphData = derive2 { name="NCIgraphData"; version="1.6.0"; sha256="1mg7rw32is8zp86rgypp0m4xv9s2phhl1z7dvdcz5knmh0c15rp8"; depends=[]; }; + NGScopyData = derive2 { name="NGScopyData"; version="0.104.0"; sha256="0wrzkqs7171jq3h9pkphz0jb8zdr3qqvz6k3xylyd13mapjabx85"; depends=[]; }; + Neve2006 = derive2 { name="Neve2006"; version="0.8.0"; sha256="0k7xqri4z3jqaqblplijddbcmaz0j1pkmzqxk13nrw501fa8cirr"; depends=[annotate Biobase hgu133a_db]; }; + PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.10.0"; sha256="0bgcfpyhyx4dxfn54m3h9xi15xga6ckrjfr3yjmw73fyplz2bmlh"; depends=[affy annotate Biobase gahgu133plus2_db gahgu133plus2cdf PREDA]; }; + PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.4.0"; sha256="00jdgz26ywqff7a216snj25kdd1dw0mh8y2qjscw9rii0mwxpg52"; depends=[PWMEnrich]; }; + PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.4.0"; sha256="06mm7vp93g9jy5jxkcn2cmn8w1dq3k97aymi24hzgynnbzx4bcw2"; depends=[PWMEnrich]; }; + PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.4.0"; sha256="0ivzysswnmj338fb4nmriw3hnslg4s8mqcskibgs42c2vm5c9ak1"; depends=[PWMEnrich]; }; + PathNetData = derive2 { name="PathNetData"; version="1.6.0"; sha256="1wcwbkhr4m3y3yp8p4zqyjlf6gvidzfds967bflfmf6yfgfbfmf4"; depends=[]; }; + ProData = derive2 { name="ProData"; version="1.8.0"; sha256="1lwa3cick6v4cdmb0das24vh8jpf9c5vnw2mpsckiaqzffx32n9j"; depends=[Biobase]; }; + QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.0.0"; sha256="1iwaing44cknnx9bhfq7qq8xcw8zdhi73p111y9f9gk00g8kwkxs"; depends=[QDNAseq]; }; + QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.0.0"; sha256="1kzr1w4kixxdd4nnz9ipkwqisx4r7wqr657qaa81axvsw71mawmy"; depends=[QDNAseq]; }; + RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.6.0"; sha256="1z0dbjid7fj9zixi3nyx9cjzmxhc684wsfglkd937a248s7f402f"; depends=[RIPSeeker]; }; + RMassBankData = derive2 { name="RMassBankData"; version="1.8.0"; sha256="121dxhy7grdx0qgnyn303isrj4pvm8h6370vgd5bidz6vp4fh0h0"; depends=[]; }; + RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.8.0"; sha256="0gdphygdpkcsxagpc2ifyqwdbr3imcym3xjqqazr2lczwpdjaffh"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; }; + RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.8.0"; sha256="17pr4y3y6dpiqnsz5z4178jmvvdx75175kh3in4gk9q1wwsc7d4z"; depends=[]; }; + RRBSdata = derive2 { name="RRBSdata"; version="0.104.0"; sha256="1ln5jmwfxhjsqq51c02fa2s11kh2vmqgagllknimx32r105rg8mi"; depends=[BiSeq]; }; + RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="1.0.0"; sha256="02c9id94m6wyrfk2s6rm5kbxzr22jmjlmv2xkay9c2k0032687aw"; depends=[RTCGA]; }; + RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="1.0.0"; sha256="14b2rlka05vp1l91g37kbpff2cc9fy43wmr90xqh0ka6rp1yh9d3"; depends=[RTCGA]; }; + RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="1.0.0"; sha256="16zz3g71y0v2zbca9iiv3p09nd9rg8nh0184q30gk44spfd7chcd"; depends=[RTCGA]; }; + RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.104.0"; sha256="0nagj99fd99jamyhkqif10nib5d1l1v96j73psqk07205ivpgvfv"; depends=[Biobase]; }; + RforProteomics = derive2 { name="RforProteomics"; version="1.8.0"; sha256="1hf9m7fayq6ld6ps2jzwgfv1pxj5lzxlnaybgmfcyk90nsilbmgd"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; }; + RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.2.1"; sha256="1lk91ma5431z9j0j7p5cvkg2bvwggddjfpxy8syd981lyjmpw2f3"; depends=[GenomicRanges]; }; + RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.2.0"; sha256="0abwn5qckc5bha73msgcf2zn4v20lbyc3c7g3ag0lj6jl6n0hrb8"; depends=[GenomicRanges]; }; + RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.2.0"; sha256="1q9dcjqwf6n5zld1wfcy0s1qjg0fgxvvxfjvxfmlialwxc0bq3wm"; depends=[GenomicRanges]; }; + RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.2.0"; sha256="0ycy0a270vn0q0psa4ypdj6vwhfmwa15046dmi17xhw73rh3409k"; depends=[GenomicRanges]; }; + RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.2.0"; sha256="0zih5n5jh0fwjyswdk7m2v0dyqxclsgd1plblgzsdmg9gk0xr99q"; depends=[GenomicRanges]; }; + RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.2.0"; sha256="0xkhdxam57zshrx3x8iyqlx15iyfnb5zjpc51fzw286xx7qkwm12"; depends=[edgeR]; }; + RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.8.0"; sha256="0xqzzrgw759kh9had1iav2ffvvdbpf83f8wvpxwb3djpikaxh8s7"; depends=[easyRNASeq]; }; + SCLCBam = derive2 { name="SCLCBam"; version="1.2.0"; sha256="0l8bh4zlrqzhp0gfqzjsqyl24i17r7mg834dq66815ziq3qxk1i0"; depends=[]; }; + SNAData = derive2 { name="SNAData"; version="1.16.0"; sha256="1m84i5w4kmwlfxaa4y5l1jia0k4mv5jg1amyhakyyp5vgznc8j6d"; depends=[graph]; }; + SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.6.0"; sha256="0jbmjc6bkqzi8m6vkr9lk88497b42bqbvjcjm43im9m28y6dacnb"; depends=[]; }; + SNPhoodData = derive2 { name="SNPhoodData"; version="1.0.0"; sha256="1b784dvqahr36953km181m5fh6cp00v9yhqf2gpadgfzbxvfz2zr"; depends=[]; }; + SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.2.0"; sha256="025zx7s86yry6j80n08cxai8if8wghvfbkx711ilgs480vd32j1v"; depends=[]; }; + SomatiCAData = derive2 { name="SomatiCAData"; version="1.8.0"; sha256="0knq9122zj2mb1ivv5r2i5jzrj0xr70i7yxkv176rkp7avbvxjlg"; depends=[]; }; + SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.6.0"; sha256="0rrw0ya3hpj020wif3hhnaqprcbjyw859mn70p0ncgjrz5rwrcs9"; depends=[exomeCopy GenomicRanges IRanges stringr]; }; + SpikeIn = derive2 { name="SpikeIn"; version="1.12.0"; sha256="157a1ckrpx6n35w8c9ipv0dnx24y76bm1vpk7mkdlbc6wblw5lwx"; depends=[affy]; }; + SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.10.0"; sha256="0bmwlc4zg2pf4da2gzys5sjbm3fzr6piw7jmbb44zxm0hgzjvx4g"; depends=[affy Biobase]; }; + TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.6.0"; sha256="051iwkzynlqw5kncbkr92m4qim95h1gri0dymm1dw2b6xzni9kmr"; depends=[Rsamtools xtable]; }; + TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.6.0"; sha256="1spgsvrlw63w04197s9a6hg7vxy3q1mjwvk649bzhi7d3y6fq055"; depends=[]; }; + TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.104.0"; sha256="067hzawwylvh92hb6gg5wj6k4rlsmvz3n4i995g8kzxzwwirh8hp"; depends=[Biobase]; }; + TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.104.0"; sha256="0dbmf3q5602fbp8jqkny33rnhvsvylhz2b5lfh6gkrqv33bc7frk"; depends=[Biobase]; }; + TargetScoreData = derive2 { name="TargetScoreData"; version="1.6.0"; sha256="1lrywj4q3ama0qhrbx0ij2h79gn3syln6zrfl0cbjj1qc0gs622w"; depends=[]; }; + TargetSearchData = derive2 { name="TargetSearchData"; version="1.8.0"; sha256="1f6lkhy2ykmd625cr0yiw7x4hzs1s00cygicl9bbpfg8bq5zd600"; depends=[TargetSearch]; }; + TimerQuant = derive2 { name="TimerQuant"; version="1.0.0"; sha256="0fqw9md30q11zvqi02paas7kmwwvg882wx678yv2928cn5ba32p6"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; + WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.2.0"; sha256="0zad0d17w85pam99ib5x4a5459d3ds8rm5l8q09zsg1x5xkx387j"; depends=[]; }; + XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.8.0"; sha256="0xbnx3093xz3ifiaj3kjl3kcnl1qgbpnii7ypz5apldf8jhji15z"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; + affycompData = derive2 { name="affycompData"; version="1.8.0"; sha256="0bzbnqz0f5vbi01hv7mjc7ajdd68hql046ly7vskma0wgrmqhqxj"; depends=[affycomp Biobase]; }; + affydata = derive2 { name="affydata"; version="1.18.0"; sha256="0vcmpy73wzhgqj6fg7qqdng3x7mi1pvdj563przsb301mviyyqyh"; depends=[affy]; }; + airway = derive2 { name="airway"; version="0.104.0"; sha256="14wc32azs9zcxw6q639xpxyzq6r1ws6c5zbf9fvisp4cfmma8z7f"; depends=[SummarizedExperiment]; }; + antiProfilesData = derive2 { name="antiProfilesData"; version="1.6.0"; sha256="0j7rsxkl9wpp7hbgm8jkmc16m842839x5adnlrqikz64r292ihip"; depends=[Biobase]; }; + bcellViper = derive2 { name="bcellViper"; version="1.6.0"; sha256="027cznns57mvqphkbw3z39lywv9f3cwyrc5cc5nr8271s9cxgvzq"; depends=[Biobase]; }; + beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.8.0"; sha256="0xsz00i1rsm770fpx705bp0lhxq789i7fyrh6nxgb3dvymm6sfnl"; depends=[beadarray Biobase]; }; + beta7 = derive2 { name="beta7"; version="1.8.0"; sha256="1ifrpg46dmxmaxr9vzff837skqwdb6672m9w238lnml4y2rmvxxh"; depends=[marray]; }; + bladderbatch = derive2 { name="bladderbatch"; version="1.8.0"; sha256="0r5l091dnlh17k4a75dkwjkpq0rjwl2pkp5r4wk3qf34q6dg2lin"; depends=[Biobase]; }; + blimaTestingData = derive2 { name="blimaTestingData"; version="0.104.0"; sha256="03v192y9b07h4jlj9vjfzwpnlk7xczcqlwrpjpgand633769hanz"; depends=[]; }; + breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.8.0"; sha256="0zn7s7bppvynnch1fbd3g1hax5y0bw80bhnqwsksm2kjj6b7p4f9"; depends=[]; }; + breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.8.0"; sha256="14pk3gi3xn14vs49ay5rxn5mjpc033h5rln8646lljyng7i5j137"; depends=[]; }; + breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.8.0"; sha256="0gy90309nvwhhx8hvng4rf1nmvfkgljmvr6z2xd5j2j6l3waii2d"; depends=[]; }; + breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.8.0"; sha256="1k8l3hgnnzw3qlyb57ys81w2v9hk1rr20p0w3bcd33nrhacr2nh0"; depends=[]; }; + breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.8.0"; sha256="0w8nmly2gcvw3y628k3ckfkv19fq8vxhf15bqw8z5qq974rp2vis"; depends=[]; }; + breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.8.0"; sha256="0vx2bqh5asjjdy1jnk0n22adanmmb4s3hdxg8645y121mprrg2jp"; depends=[]; }; + bronchialIL13 = derive2 { name="bronchialIL13"; version="1.8.0"; sha256="0mbjpx0w5bqbb9vc0x7zl78m6y0gkcad1abfycjlpr7yhf3i1k76"; depends=[affy]; }; + bsseqData = derive2 { name="bsseqData"; version="0.8.0"; sha256="0rlls31yyzkisx61y0i15qgkc5ixk0xkd2ix03cv4zz1fv0iyz2x"; depends=[bsseq]; }; + cMap2data = derive2 { name="cMap2data"; version="1.6.0"; sha256="0zwzynw8i72g2zy9kfipz3rik1n7c590bxxniwxz884fafwgn5yw"; depends=[]; }; + cancerdata = derive2 { name="cancerdata"; version="1.8.0"; sha256="1cdiqx8f5d2af46mnad5zjaazxw2qh68h0hg4sj8p8xxjf2l1d3f"; depends=[Biobase]; }; + ccTutorial = derive2 { name="ccTutorial"; version="1.8.0"; sha256="0lvsl9127djdrkpk5c4n570sr06yj5x24lfbhrvy4jk8qa4g1qx3"; depends=[affy Biobase Ringo topGO]; }; + ceu1kg = derive2 { name="ceu1kg"; version="0.8.0"; sha256="1cm2myjmrn2kiwgfjpkslz0s6l8qvs8g3y0jbfckp31sd1211kkh"; depends=[Biobase GGBase GGtools]; }; + ceu1kgv = derive2 { name="ceu1kgv"; version="0.12.0"; sha256="165qp5cfs87ds7sx525fpj5cwisl4520b911l0xxmgcvhz6gjyi5"; depends=[Biobase GGBase]; }; + ceuhm3 = derive2 { name="ceuhm3"; version="0.8.0"; sha256="10plz831m2vynwn5x4kh93iwcwkn6x39q9qg25lvlrj8j3mqgjmg"; depends=[Biobase GGBase GGtools]; }; + cgdv17 = derive2 { name="cgdv17"; version="0.8.0"; sha256="0wjx4072gpsv6w1x7d5q0qya0ism5xw13zl8d1m49jhszk2kns1j"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; }; + charmData = derive2 { name="charmData"; version="1.6.0"; sha256="0qy3dcx745diza5xy6f1qipnnawqx20vp6p0piy9wvwvgalcx886"; depends=[charm pd_charm_hg18_example]; }; + cheung2010 = derive2 { name="cheung2010"; version="0.8.0"; sha256="0qrq5k8gpsvqv5vhq67lgql69x7gqsqyfrs87ih8jir1nhgyrmzy"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; }; + chipenrich_data = derive2 { name="chipenrich.data"; version="1.6.0"; sha256="04v1zzn7balic5hxlxdgqxpgg0pbsyg5s0ivhn232c3qbidh480g"; depends=[BiocGenerics GenomicRanges IRanges]; }; + cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.6.0"; sha256="1ys4sxp4biqb8bgqds9y22kiiwxhbv3p32vrbj1vm9fn3isphqr8"; depends=[cnvGSA]; }; + colonCA = derive2 { name="colonCA"; version="1.12.0"; sha256="0nf4nfjymm0vw7zdi0wpcn8kc49kfangnsfajvarpwjikff2bcsl"; depends=[Biobase]; }; + curatedBladderData = derive2 { name="curatedBladderData"; version="1.6.0"; sha256="0rs2fslz39nyxs4v0zjldlascc0rnpzzisxhrnb913y72wlk7fad"; depends=[affy]; }; + curatedBreastData = derive2 { name="curatedBreastData"; version="1.2.0"; sha256="01q37mlxlh0sdnb8ilsr6s5k40awgcg0n5ggj056dcna9nfvqi74"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; + curatedCRCData = derive2 { name="curatedCRCData"; version="2.2.0"; sha256="0p4jgmg3234siglzf1klzq70vgrsnxcz4w2fw16h34m7jkrhiqas"; depends=[BiocGenerics nlme]; }; + curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.8.0"; sha256="1fdwns0srpkvzvs87zq7wq6a3a324d6l8mjxncryxdcbgjfv3fb8"; depends=[affy BiocGenerics]; }; + davidTiling = derive2 { name="davidTiling"; version="1.10.0"; sha256="06kjzkgqigfnd44yd9czccqn8nill4v3x3dfk7kmzbz7lmmrdhx1"; depends=[Biobase GO_db tilingArray]; }; + derfinderData = derive2 { name="derfinderData"; version="0.104.0"; sha256="0biqbxm3fcqxsmv3bkxb66cpv54iswpsjizh7i6qmilw20fcrdm6"; depends=[]; }; + diggitdata = derive2 { name="diggitdata"; version="1.2.0"; sha256="190ppd35dg559g557kwvd0kpl900x9jvarflhxq47p9zgg35yrvf"; depends=[Biobase viper]; }; + dressCheck = derive2 { name="dressCheck"; version="0.8.0"; sha256="03k7m4fr6ac1pfjz86sgz8ywmvxdxjxpd4rrdgix8bn88mfw9qyi"; depends=[Biobase]; }; + dsQTL = derive2 { name="dsQTL"; version="0.8.0"; sha256="0qh73b5xbrcdmp3kszykiqiha8s40r0npsajc1h0m7xh26b81d90"; depends=[Biobase GGBase SummarizedExperiment]; }; + dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.8.0"; sha256="0rssxjpjb7aqkkm6mg1s7df8kzbxiww9yfdljif9ph7s0svi4b5v"; depends=[GEOquery marray]; }; + ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.10.0"; sha256="0vv5ffk08kfqahsz9ib7144hywcqmvm30rpgff18kvqz2ri4391a"; depends=[affy ecolicdf]; }; + encoDnaseI = derive2 { name="encoDnaseI"; version="0.8.0"; sha256="1n6n5jfaqh1gr19grvxkpbs30314s524wfy6ppfqczxw00yrsvqk"; depends=[Biobase GGBase GGtools lattice]; }; + estrogen = derive2 { name="estrogen"; version="1.16.0"; sha256="0r4gb1vnq6nk97fqkhr9x7lq6jljpkmk7q95s0hwjnyavpwwi5qm"; depends=[affy]; }; + faahKO = derive2 { name="faahKO"; version="1.10.0"; sha256="0dkpzkdlpi757h6kkv02j74nxwz770l7jfmdz6hh6np0c27yrlqk"; depends=[xcms]; }; + fabiaData = derive2 { name="fabiaData"; version="1.8.0"; sha256="1syxcgmvb00a4k1l3c17rsmllsp4baxpqw85gvzlkix038bdwqcg"; depends=[Biobase]; }; + facopy_annot = derive2 { name="facopy.annot"; version="0.104.0"; sha256="139wd2w7mmrwi69h5mlf73zs3zaqr0kcjv116pd2r7b1dryla9y5"; depends=[]; }; + facsDorit = derive2 { name="facsDorit"; version="1.12.0"; sha256="0dlbjvzalixpxcxwls6wrlzz4lrmsxs23g1yvin940al9hli612d"; depends=[prada]; }; + ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.8.0"; sha256="19vf4q4nqk937gvn8ca4kvisyxw375xlj9g238xmlh1z33bqak7y"; depends=[lumi]; }; + fibroEset = derive2 { name="fibroEset"; version="1.12.0"; sha256="1brnc0vigpi711yc1yq69x39sksnqd26dzip174ih66hp0if3rsm"; depends=[Biobase]; }; + fission = derive2 { name="fission"; version="0.104.0"; sha256="0lbzl0r66q8h9x41167zhx3zdmf6wq1f7z1hxmq8inpl0ydrynnm"; depends=[SummarizedExperiment]; }; + flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.6.0"; sha256="0ngq0khy7f7w41mj89fdrrd5lpxznnxg53x6zfgc6mx0vm1q13ak"; depends=[flowCore]; }; + flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.6.1"; sha256="1y97xym505rpgsyi1nbsazaqwfxrkmp664pmdlfvp8a3l963bs2n"; depends=[]; }; + frmaExampleData = derive2 { name="frmaExampleData"; version="1.6.0"; sha256="172bvi6v824j82cr2y9y5zvdgzfwk4kdw0r54jqjgvp2kw4v55bx"; depends=[]; }; + gageData = derive2 { name="gageData"; version="2.8.0"; sha256="1h2gyn9nn8198qd99bdpf7r9f71l76yzzcagbg9z9qjhpc1nwllq"; depends=[]; }; + gaschYHS = derive2 { name="gaschYHS"; version="1.8.0"; sha256="0097vvw6z3ryiv11jvapih2r588ix7qdizmq5g3cc1s5dqrmaf02"; depends=[Biobase]; }; + gatingMLData = derive2 { name="gatingMLData"; version="2.10.0"; sha256="1ql5s1p4phhcc9lh3knrgnazkpxlxhvwpvxi0d978g6mjlbbprs2"; depends=[]; }; + gcspikelite = derive2 { name="gcspikelite"; version="1.8.0"; sha256="06k158hh3pyn9fw49njar3aj71f12pgkm2yaljnvlnabgv7r0a84"; depends=[]; }; + geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.6.0"; sha256="0zijh0s2dp1rf7z4rs8afdx18gqgsll090vclckf30jy3jy7d0ri"; depends=[GenomicFeatures rtracklayer]; }; + genomationData = derive2 { name="genomationData"; version="1.2.0"; sha256="08p1n2gp3csw7jvlkq5h3r64ix08n7kniq508w28nc0mms3pa4vn"; depends=[]; }; + geuvPack = derive2 { name="geuvPack"; version="1.2.0"; sha256="17wy3fkwq16kg3zcm30b06p0a6xwpjbjqrd2rz42ypw7d7danc3h"; depends=[SummarizedExperiment]; }; + geuvStore = derive2 { name="geuvStore"; version="1.2.0"; sha256="14xm3d808mzbvjliazn2rzz9l98b44h4x4s50ass2mfr470k79fs"; depends=[BatchJobs GenomicRanges gQTLBase]; }; + ggtut = derive2 { name="ggtut"; version="0.7.0"; sha256="0vpqzanzx3mwaz0dz29s5k9l0nly004sn3f5rjx7z8ww67ka4ii6"; depends=[cheung2010 ChIPpeakAnno ff GenomicFeatures GenomicRanges GGdata GGtools hmyriB36 Rsamtools SNPlocs_Hsapiens_dbSNP_20120608 snpStats]; }; + golubEsets = derive2 { name="golubEsets"; version="1.12.0"; sha256="0y861yr3b9c5rxi1x9796ka9bycpkwfpj7n10ikxkqggip02044j"; depends=[Biobase]; }; + grndata = derive2 { name="grndata"; version="1.2.0"; sha256="042cm5imcb1fzmm7cn4lyd8isq9yddrnvdmqv7gzklrpplhlcfa5"; depends=[]; }; + gskb = derive2 { name="gskb"; version="1.2.0"; sha256="0b2vd4vn1khk4cd3pdcxwbd26srk3w3zdlk864vhgha5n9wb89kb"; depends=[]; }; + h5vcData = derive2 { name="h5vcData"; version="1.104.0"; sha256="1jhr6gijva7498hm2mzi94ag0wx8qx16nf7l454v631px12b2hra"; depends=[]; }; + hapmap100khind = derive2 { name="hapmap100khind"; version="1.12.0"; sha256="19g5krckkxfnk2mbvlk2agwn2n1pwx6m343nngr07lysxjdddsz3"; depends=[]; }; + hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.12.0"; sha256="038vf5xfkn266f5w0hffdn7f8xi4h4dg2fyq1lj7b8mw3hzsbd8s"; depends=[]; }; + hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.12.0"; sha256="1xz4l3nj60z10n0ia6vi6b1sc5crkl6my0axjrlc0qq7jzxpvyf2"; depends=[]; }; + hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.12.0"; sha256="1qip3qzri1ihms528wff1y9ci6zq0j3czbcs7hqiyz57yxi4phxl"; depends=[]; }; + hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.12.0"; sha256="1xb9jv4viy1q1bvcz795j25fa9ss3xrrplz3rykbnis5h87n6lbj"; depends=[]; }; + hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.12.0"; sha256="0a3qshi8024n7bc8g9h3qivp6xzkd40xsll948jldzid49scqdmi"; depends=[]; }; + harbChIP = derive2 { name="harbChIP"; version="1.8.0"; sha256="08kr48nvrmphj7sj9nbj0mj1hyl97pp0g7qcnr6fb8vn5lvyriag"; depends=[Biobase Biostrings IRanges]; }; + healthyFlowData = derive2 { name="healthyFlowData"; version="1.8.0"; sha256="1wj48wagn93g7w5apl4jxii34wxd7dhiya965bkbjj6h2yhwykfd"; depends=[flowCore]; }; + hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.8.0"; sha256="0ccrqiw4348vg3pw0pl4bi846ax7spi0bxrs44gp4bsjp7amn1s9"; depends=[]; }; + hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.8.0"; sha256="17lrqvdmqc363jqr5chp3yp452hi5592d33hznira1ra9xjdk30c"; depends=[]; }; + hgu2beta7 = derive2 { name="hgu2beta7"; version="1.10.0"; sha256="0ylz3l54ip7rqiwlbzfnk65hhm4v5rd9mi5g1r97n9k6gyfd692d"; depends=[]; }; + hmyriB36 = derive2 { name="hmyriB36"; version="1.6.0"; sha256="033afw26ng2vc0fj3ipljmrq8vm0q5nbr7gh78i5vmpnkh4d5wgp"; depends=[Biobase GGBase]; }; + humanStemCell = derive2 { name="humanStemCell"; version="0.10.0"; sha256="18fwmsf2yh4q12ca7h78lk85rcf3a3l57v0hm72yw3zjdhhakfrp"; depends=[Biobase hgu133plus2_db]; }; + ind1KG = derive2 { name="ind1KG"; version="0.8.0"; sha256="10yiqj0c4vclblblkr0hwair1hyyrlp5z81y72vcjgv4wkfmxsbk"; depends=[chopsticks]; }; + iontreeData = derive2 { name="iontreeData"; version="1.6.0"; sha256="1bl2f2kk930bry8ibl3234s3ijszxfm0xhcqjay771xcfhf9c14q"; depends=[]; }; + kidpack = derive2 { name="kidpack"; version="1.12.0"; sha256="0zvdm8xyn7xwaf1qrlaizh1aqdwbicnm0l7kr554k651plcazjd1"; depends=[Biobase]; }; + leeBamViews = derive2 { name="leeBamViews"; version="1.6.0"; sha256="16g1nz8mxr31ww39y7aicvqrhlrxwbdvcnz6cl105md43f10h7v2"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; }; + leukemiasEset = derive2 { name="leukemiasEset"; version="1.6.0"; sha256="1jfp6j60ic07jqmmcmp2cp0ha42xk8b6jldviq5463yf232mgkg3"; depends=[Biobase]; }; + lumiBarnes = derive2 { name="lumiBarnes"; version="1.10.0"; sha256="0r189bh6ysarqicrsi2s5v3d0wpl0y3ycpa85igsx6yq2jsv1hlz"; depends=[Biobase lumi]; }; + lungExpression = derive2 { name="lungExpression"; version="0.8.0"; sha256="14k7xk8817vwf6vnvc2fjk4jv876s4da8d3fi84cz3hgh51rl7rz"; depends=[Biobase]; }; + mAPKLData = derive2 { name="mAPKLData"; version="1.2.0"; sha256="03x2yzpr6xr19k7kk52x6zlpjkfjhhfly1xsvdijrma6dc0rzg8a"; depends=[]; }; + mammaPrintData = derive2 { name="mammaPrintData"; version="1.6.0"; sha256="1xdhww79aig0a792akwh8mgzl7qagncl26kwv8fn4hw5vrjyxmyg"; depends=[]; }; + maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.14.0"; sha256="1h50zfm49rihda3agfb4ldlaaw651k82cfjranzp27h089glskns"; depends=[]; }; + metaMSdata = derive2 { name="metaMSdata"; version="1.6.0"; sha256="1qs5z3pbb6y04fk633vlps54gr6vlkvwl4qzgx4g7jxmlnm6w5sl"; depends=[]; }; + miRNATarget = derive2 { name="miRNATarget"; version="1.8.0"; sha256="1ahp2w6xcpav6virrzcb11df2wc5phhqarlwq03i2s284wx27bxa"; depends=[Biobase]; }; + miRcompData = derive2 { name="miRcompData"; version="1.0.0"; sha256="06chd7drzqnpbwnkc22mii1k3bv6dk96nl0hm1fg7hv2bc83j1sn"; depends=[]; }; + minfiData = derive2 { name="minfiData"; version="0.12.0"; sha256="10ny2i88w87zlizla2jx1bvrnhq9f245ggxdgvi6slrlp35l2s68"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + minionSummaryData = derive2 { name="minionSummaryData"; version="1.0.0"; sha256="0zk9xfyxbdzxpz36ly1nsqrw29zmxqs71x1q3iks0p9jd60iwwrv"; depends=[]; }; + mitoODEdata = derive2 { name="mitoODEdata"; version="1.6.0"; sha256="07dpak6jdw7mz5jjnysyg82wikjxnk8z4wngfhdfzl0wxg23pbzx"; depends=[]; }; + mosaicsExample = derive2 { name="mosaicsExample"; version="1.6.0"; sha256="02lcjb38gf0kr2s7ydpzh1slh6d1b9vfgdk4fab2nb1k6g6nd6fm"; depends=[]; }; + mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.8.0"; sha256="0dxdg11shs4lj4vb9ja7i9v9xsdpw63ymhzlfq46claydmxgkcyz"; depends=[]; }; + msd16s = derive2 { name="msd16s"; version="0.104.0"; sha256="0xh438ayq6pxxwmc79z4cr9mw8ribh09b9x43jcka1nn9g6vka46"; depends=[Biobase metagenomeSeq]; }; + msdata = derive2 { name="msdata"; version="0.8.0"; sha256="0dl7q8r2bxqx130w0d3d860svdsnjwhsxq709xk3ir4zn6kdn2qz"; depends=[]; }; + mtbls2 = derive2 { name="mtbls2"; version="1.0.0"; sha256="0fqmzvxznik2abrh12q4ifq3yxk6nvzf1lx2mnw0cwqgndma0vcn"; depends=[]; }; + mvoutData = derive2 { name="mvoutData"; version="1.6.0"; sha256="0whmdrlnxcm4h03gh9xm386cjir6y86k1kzdl3z50y7ydzl0zkyy"; depends=[affy Biobase lumi]; }; + pRolocdata = derive2 { name="pRolocdata"; version="1.8.0"; sha256="0ndwz3z7jzyr6ac1b8cq6j0qfm8s28hpv42w5bsgp2vp85prqa1d"; depends=[Biobase MSnbase]; }; + parathyroidSE = derive2 { name="parathyroidSE"; version="1.8.0"; sha256="1g80lgbla7dpd1vcvsqgmwqcp71mwnsyps6qpgmyhyq8z5jxgkmb"; depends=[SummarizedExperiment]; }; + pasilla = derive2 { name="pasilla"; version="0.10.0"; sha256="1ydiywvw8afs5j109dnbiq6dp5inm2al8rivfgdfiqbi7w0a4iqz"; depends=[]; }; + pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.8.0"; sha256="0x4n9hqpfgnzpbsa7arzav027n0yyglljdaflzy0z8vvypp9skri"; depends=[]; }; + pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.6.0"; sha256="1kzl95mw08162widlycg3g1230c2dsf3cbvai1pb6sc4s1sb5m1k"; depends=[]; }; + pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.6.0"; sha256="0h6yg6glzsncq7k72vn3l8gxihs3r3kq7420c0sqbp2pljkcycn7"; depends=[]; }; + pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.6.0"; sha256="087fq848yyq5vl1sv5984qwbjk7navdx82gqwq4446035cv409x5"; depends=[]; }; + pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.8.0"; sha256="08f4chypg6hkgi7idq3709zij0xpw3k2rj8gkcyld4s141nzv115"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pepDat = derive2 { name="pepDat"; version="0.104.0"; sha256="146wha2frjy8b9b6nkghp7aqzrilgircglpq1k0knzndnan4k4mq"; depends=[GenomicRanges]; }; + ppiData = derive2 { name="ppiData"; version="0.8.0"; sha256="09f14jlrbc9pqna1a5lhd9l32m4jhjgghhdczlc7kni75mzsb7ii"; depends=[AnnotationDbi graph]; }; + prebsdata = derive2 { name="prebsdata"; version="1.6.0"; sha256="0gfff1fafp5jyyfh71l7lvddm0xbx215hac92mwlkmksi8jz3f74"; depends=[]; }; + pumadata = derive2 { name="pumadata"; version="2.6.0"; sha256="1lw6jii68pzrbr3cgb0zsfbjflz526l3r5qrpbnavz0szjca4h5y"; depends=[affy Biobase oligo puma]; }; + rRDPData = derive2 { name="rRDPData"; version="0.104.0"; sha256="0700xlvfkgyrdgxyq5l0dlq2p3qf51jzamp28qqhs95440cyg26l"; depends=[rRDP]; }; + rcellminerData = derive2 { name="rcellminerData"; version="1.2.2"; sha256="1xaq03x8qxbczq0g880vdgria93s5bq2hn2nx5gz3b1qkkwb1sx9"; depends=[Biobase]; }; + rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.8.0"; sha256="161psq421pkdd9kzfk62633sj4cql2q0wjwzivjph9cm228238mp"; depends=[]; }; + seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.2.0"; sha256="03x8v75s6v3yyycgk6zwsh4j2mnsxndgbxmcw8q2a57q13y58bwi"; depends=[]; }; + seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.6.0"; sha256="1avgc0qm26r18pxrdm3fp2wrqzcapind4cb88d4z4v2gmp8y04sh"; depends=[]; }; + seqc = derive2 { name="seqc"; version="1.4.0"; sha256="0vkw4ly21jx1lqn6hhdi43mbq7idsxb4a21inwdv5fzm7vdkplb3"; depends=[]; }; + serumStimulation = derive2 { name="serumStimulation"; version="1.6.0"; sha256="14sncdp7zb0ddifr6bcy14nxp8h9dvy3gy354i74h86yvkwdv9s8"; depends=[]; }; + seventyGeneData = derive2 { name="seventyGeneData"; version="1.6.0"; sha256="0l9nkprrvkdi764b9l3rckd7zqv13y55m4s37ls3xp63i9yddqm9"; depends=[]; }; + shinyMethylData = derive2 { name="shinyMethylData"; version="0.104.0"; sha256="0w8r5g3925jy6pb5dm916lns9h7qgwy2vwnl87dwa5ff17rfmj81"; depends=[]; }; + simpIntLists = derive2 { name="simpIntLists"; version="1.6.0"; sha256="014sx5jca37jb97wblc47vspxx7iwi6vpzwrgjl22fvv7p0claj7"; depends=[]; }; + stemHypoxia = derive2 { name="stemHypoxia"; version="1.6.0"; sha256="0b25q1wni5yfjqxmhkjddnh2301rnx692n8n4ghv4l6sbq5x2kz1"; depends=[]; }; + stjudem = derive2 { name="stjudem"; version="1.10.0"; sha256="18k39mj374c2lfvjkvnzmm2phnisq8dxmsg0jgarzwqxc6740xak"; depends=[]; }; + synapterdata = derive2 { name="synapterdata"; version="1.8.0"; sha256="0ivs32fv6hfna124bmc5bbj1pj9jw15qays105djwidsik0q4ml2"; depends=[synapter]; }; + systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.0.1"; sha256="0zsqqsbln5isipr186af73084bn7yq6c4z7mni4pckwh63q45w2p"; depends=[BiocGenerics]; }; + tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.8.0"; sha256="1wbnxqmr40iy6hcpks7fafmlwzi6q1nc87494kkcsxcg698317dk"; depends=[]; }; + tinesath1probe = derive2 { name="tinesath1probe"; version="1.8.0"; sha256="0aynz111vj0zki74c5bp3f8rvmm7in52ww9aknfszgg6gi02a382"; depends=[AnnotationDbi]; }; + tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.8.0"; sha256="042z8g1mb5hiziqqbjngca1vi5mvgjny7fhx6q1z0nxrymg4yay9"; depends=[Biobase]; }; + waveTilingData = derive2 { name="waveTilingData"; version="1.6.0"; sha256="0xx60f6gvcqvj6m5wqh7mjcf0skbzz5w5bchcalmhgy56l7229a1"; depends=[]; }; + yeastCC = derive2 { name="yeastCC"; version="1.10.0"; sha256="07nhfambydc613smwajcv8qiwg0rc8zvjmyfcvi91nz49xr3cygq"; depends=[Biobase]; }; + yeastExpData = derive2 { name="yeastExpData"; version="0.16.0"; sha256="1lzz9kp9raihi3n5p05saz549kblx9k1hy9fwvh73l91gm2lmazx"; depends=[graph]; }; + yeastGSData = derive2 { name="yeastGSData"; version="0.8.0"; sha256="1vzfl8ykwwvjs58w5h8myrqfj67qpaf1zaf714r70pzx9zc1slpp"; depends=[]; }; + yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.6.0"; sha256="0d3ixzas7m4xdc20996di8x48z661i213rhkd4l6hqb4hdjb6mm8"; depends=[]; }; + yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.8.0"; sha256="1nv31zdy2br27qskz5dwxnpz2zgi0mx2fp8ddhbffrkww8zcha4m"; depends=[]; }; + yri1kgv = derive2 { name="yri1kgv"; version="0.12.0"; sha256="07lmji9sljscwqd96bcllwc3hqzrl8mwj9z7fc6kjaam491iz09f"; depends=[Biobase GGBase]; }; + zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.104.0"; sha256="11z6p4f8nmgjas085dvb2fnlsfb8qbbfh0jzx650sfkb2fgqqr6l"; depends=[]; }; +} diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index b181f6be53ba5..391de183df663 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -6,15 +6,15 @@ { self, derive }: let derive2 = derive { rVersion = "3.2"; }; in with self; { - ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.0.0"; sha256="0mxw5s4cfh9dhlwm485n3x7wf81hww1353ilz1zy1wvjx0dacb99"; depends=[gplots Rcpp]; }; - ABSSeq = derive2 { name="ABSSeq"; version="1.6.0"; sha256="1cg7d55s25jxjbb95q7izjdlq7fck2v2hyjrbbfk1b6b28aayffj"; depends=[limma locfit]; }; + ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.0.0"; sha256="0mxw5s4cfh9dhlwm485n3x7wf81hww1353ilz1zy1wvjx0dacb99"; depends=[ABAData gplots Rcpp]; }; + ABSSeq = derive2 { name="ABSSeq"; version="1.6.1"; sha256="0cqscx7mxady04k3f4s24rbx961sj95i2wwysxkcc0a9my25sqfg"; depends=[limma locfit]; }; ABarray = derive2 { name="ABarray"; version="1.38.0"; sha256="15zdfwpi3hgadydxlsksr7gh7wg577qcwp47zm8mxh28mcl9l048"; depends=[Biobase multtest]; }; ACME = derive2 { name="ACME"; version="2.26.0"; sha256="020cfccwkpk5w8xpg3xn2pcrksda67r4yg6im2qlljqrmaijjb9k"; depends=[Biobase BiocGenerics]; }; ADaCGH2 = derive2 { name="ADaCGH2"; version="2.10.0"; sha256="11hhmap9f8iqcxf4n4didb6isswjqdwwdc1yfm2056mcgny16r91"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; }; AGDEX = derive2 { name="AGDEX"; version="1.18.0"; sha256="0hy5kl6j8hx10a03x44lqij0j7bkg4rx5lf5aicx0mrd1g59b6w1"; depends=[Biobase GSEABase]; }; AIMS = derive2 { name="AIMS"; version="1.2.0"; sha256="14xpa2590rkqbmq8kfm356syas117342pn1wah67mb9r45klipb9"; depends=[Biobase e1071]; }; ALDEx2 = derive2 { name="ALDEx2"; version="1.2.0"; sha256="0p59g70472b11ab1ggzxb7l6rg5sxmb8nk47b5z4qb1lf0a0x576"; depends=[GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; - ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.10.0"; sha256="11qhbvgyimfnclmn7jyl9rsvkphh854a28d29rr6fc6gvmns7y40"; depends=[]; }; + ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.10.0"; sha256="11qhbvgyimfnclmn7jyl9rsvkphh854a28d29rr6fc6gvmns7y40"; depends=[ARRmData]; }; ASEB = derive2 { name="ASEB"; version="1.14.0"; sha256="1wr7n250gv1xmnkp5xvbvc3ccwm3ffdj63bj5ifarphb4xs16kf6"; depends=[]; }; ASGSCA = derive2 { name="ASGSCA"; version="1.4.0"; sha256="1xp7g1vhvk4m3z88pnnchjxk03q5vadrvzrb1p5rys6svfk4z9vp"; depends=[MASS Matrix]; }; ASSET = derive2 { name="ASSET"; version="1.8.0"; sha256="17pswg3babj454rr6hcnk8k3bgm9rcw2zn8yvvd1jx79bairz47p"; depends=[MASS msm rmeta]; }; @@ -24,13 +24,13 @@ in with self; { AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.16.0"; sha256="122v40vq7pzl1qlycv8rvsq3r9ialkvsa8qm5drybf5f4nlk6wm8"; depends=[affy]; }; AffyTiling = derive2 { name="AffyTiling"; version="1.28.0"; sha256="08n1w64yk1pxb9d8dpa86y3mqxrsvyq0gsfzlsqg6fz8jz497fhr"; depends=[affxparser affy preprocessCore]; }; AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.20.0"; sha256="1pb0491rgcjfnnv4xmf73bdawiggi4872w238qlf96i9a9r0gik2"; depends=[affy affycoretools Biobase limma preprocessCore]; }; - AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.8.0"; sha256="0bmh8md0f5hcs0zwkfxs9h7w8pzvqb9v9j2ld752m9qz0ckx2zk7"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; - AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.4.0"; sha256="19gj3rdglkdr5hvlqvb3l5m1371pq3197cj9kxhxvmzn5npqsl8l"; depends=[Biobase graph log4r rjson]; }; - AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.32.0"; sha256="0b07wzyxfg0cn9y1jz9fz51xjwf78immwjhfsg892rv1i0m34zx1"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; }; - AnnotationForge = derive2 { name="AnnotationForge"; version="1.12.0"; sha256="0rzag4a8x8pmsiwy42ir831ph2km50xh1m2za9s36d6zzzz9q4q4"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; }; + AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.8.1"; sha256="1410sr3xfjwz7szl9w17h9n03im3wd9w1q25cnlyg4ipmp2xc89h"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; + AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.4.1"; sha256="0zq0h9abswvhkpgb6f966rhgj7lh02aykq88fphxfv9zzkjfxbjp"; depends=[Biobase graph log4r rjson]; }; + AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.32.3"; sha256="1v6x62hgys5827yg2xayjrd9xawbayzm6wy0q4vxh1s6yxc9bklj"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; }; + AnnotationForge = derive2 { name="AnnotationForge"; version="1.12.2"; sha256="0dybwq4v6f99w5v2hg519wc3y01i1hq1jd250dkj9976y8lhx0b8"; depends=[AnnotationDbi Biobase BiocGenerics DBI org_Hs_eg_db RSQLite S4Vectors]; }; AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.20.0"; sha256="03rznpbsgq3pdh0id35vp8984f57ws2jpb0cww1qxglf967gy028"; depends=[AnnotationDbi]; }; - AnnotationHub = derive2 { name="AnnotationHub"; version="2.2.2"; sha256="13r6ly48wyh5yh9622y8c93m4p5kq668n4h8qgv0y265cx71aif1"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; }; - AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.0.0"; sha256="0b2d10zr5q7hrcrgzngv5nnz097kykzrd1njacn93xw3zk5vm5mn"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="2.2.5"; sha256="11vyppg8zgfdd6s7457991l7j6l7jd4p2ah1m89bg226pakfi552"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.0.2"; sha256="1d2xisxzn0cic5p5412zks5chr16g9xj159kxpkkqk1wvif6im33"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; }; ArrayExpress = derive2 { name="ArrayExpress"; version="1.30.1"; sha256="09z680q1l8fp2y389n6ik8mjymqn688j333c5fgdpmdqg1z5acx4"; depends=[Biobase limma oligo XML]; }; ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.20.0"; sha256="00a5h3nwwhi9phrys2gj0ba8a24iqxk09licb0jn1qzdz9mrfxmq"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; ArrayTV = derive2 { name="ArrayTV"; version="1.8.0"; sha256="0ny5x2w0n3di5wzywfngsfdxaciczs24cnbvk75mv6hf4bdwfp74"; depends=[DNAcopy foreach oligoClasses]; }; @@ -38,7 +38,7 @@ in with self; { AtlasRDF = derive2 { name="AtlasRDF"; version="1.6.0"; sha256="16hgw47px7ig6hrm90y5nzy3dgdfm5my58bli20aj6dhnh2yvhxd"; depends=[hash SPARQL]; }; BAC = derive2 { name="BAC"; version="1.30.0"; sha256="1yrw01m8fd54v352pcb7904f8wi3il83nx8ywf6m968x33y2npxn"; depends=[]; }; BADER = derive2 { name="BADER"; version="1.8.0"; sha256="0zw02zrxl9587qkfy6ayhqx66rqk9i80g9zgcywa69npr439qrmh"; depends=[]; }; - BAGS = derive2 { name="BAGS"; version="2.10.0"; sha256="00absrj8rlwcfa4pv3fhmb0561b2rxmr8c7lqq8jc5sncw8bay51"; depends=[Biobase]; }; + BAGS = derive2 { name="BAGS"; version="2.10.0"; sha256="00absrj8rlwcfa4pv3fhmb0561b2rxmr8c7lqq8jc5sncw8bay51"; depends=[Biobase breastCancerVDX]; }; BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.0.0"; sha256="12r0pn3nn6q725qrrwzmmzg6x58kqr89s3b536ld11jp4081yb6c"; depends=[Rsamtools VariantAnnotation]; }; BCRANK = derive2 { name="BCRANK"; version="1.32.0"; sha256="14akhngl88ywirpax984vwmzg5rp57034g2kdy0sz5x283mcmav6"; depends=[Biostrings]; }; BEAT = derive2 { name="BEAT"; version="1.8.0"; sha256="1amk6812hy56j22mdmjxjpiak60cv59plz9j7gar3nr9g6yl3c7p"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; @@ -49,11 +49,11 @@ in with self; { BSgenome = derive2 { name="BSgenome"; version="1.38.0"; sha256="130w0m6q8kkca7gyz1aqj5jjhalwvwi6rk2yvbjrnj4gpnncyrd2"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; }; BUS = derive2 { name="BUS"; version="1.26.0"; sha256="0sggag0n66n25h6g2hlk194p6fxjaapqf8bwnzw18bkpbldm3hwg"; depends=[infotheo minet]; }; BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.14.0"; sha256="0a1ksw3i7fkp84pxki5d1pnw8zryq9qapv4vxf7sgpi0q9gl1dci"; depends=[RCurl RJSONIO]; }; - Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.6.0"; sha256="0z7l5xbc23ws7jdzgx58y8nia8a588hfi785aislw7gsnki3qyry"; depends=[Biostrings caTools GenomicAlignments GenomicRanges RCircos]; }; + Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.6.0"; sha256="0z7l5xbc23ws7jdzgx58y8nia8a588hfi785aislw7gsnki3qyry"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; }; BayesPeak = derive2 { name="BayesPeak"; version="1.22.0"; sha256="1jmn8p461rmgjarf4rlhyqzrjg8xkpq56rlrk6964kqxp6jkh8bi"; depends=[IRanges]; }; BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.22.0"; sha256="04ww55171fbv9170aknl2gbc0mqlpcvwjl9146xamxskc5hxivnh"; depends=[]; }; BiGGR = derive2 { name="BiGGR"; version="1.6.0"; sha256="1bhjw46mwqyz67p82ag8y4jxvkhpd7d3a8flrs7h28d8srp9jvf8"; depends=[hyperdraw hypergraph LIM rsbml stringr]; }; - BiRewire = derive2 { name="BiRewire"; version="2.4.0"; sha256="1f540ps9ylg4d8r8pwb6hbv7klidw06hnbf2pn78inp0qqjxd2gr"; depends=[igraph slam tsne]; }; + BiRewire = derive2 { name="BiRewire"; version="2.4.2"; sha256="0xzdbh0didyk4wwr1ac9n1dj1473iqgn7s3i5spj2mrvqkj6jrgm"; depends=[igraph Matrix slam tsne]; }; BiSeq = derive2 { name="BiSeq"; version="1.10.0"; sha256="0vl0arr6chqvyysmajga91m5as54jsnx2z5a23pa7lzgvgv5xzij"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; BicARE = derive2 { name="BicARE"; version="1.28.0"; sha256="1bnwnrv6bb5va2l54y1c560s7fkmknaayf0vs4pm2s4mdamy0k2k"; depends=[Biobase GSEABase multtest]; }; BioMVCClass = derive2 { name="BioMVCClass"; version="1.38.0"; sha256="00dzbfq1rxwpp09cg2cl7rm989jidjnvw4rmmkiq8hkqv5r1mssn"; depends=[Biobase graph MVCClass Rgraphviz]; }; @@ -61,34 +61,34 @@ in with self; { BioSeqClass = derive2 { name="BioSeqClass"; version="1.28.0"; sha256="0pv63d57hck04dpha20pzyzz7przzvi536nmgnsig5zw16lis4f2"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; }; Biobase = derive2 { name="Biobase"; version="2.30.0"; sha256="1qasjpq3kw8h7qw8cin3bjvv1256hqr1mm24fq3v0ymxzlb66szi"; depends=[BiocGenerics]; }; BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.32.0"; sha256="0wn3a01l6d62prrncmy22dx4nqsgzq3lw24ybf676ghrmjaygmyc"; depends=[Biobase]; }; - BiocCheck = derive2 { name="BiocCheck"; version="1.6.0"; sha256="0wyj6ksppia539njbh9zmv7j8x8dnl0zadwkl3xbmnwmi8yw15m9"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; }; + BiocCheck = derive2 { name="BiocCheck"; version="1.6.1"; sha256="1vkhriswlk3p0xynbj2pjs9zkg9v168g3sbi0ripcbn9v93mcp89"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; }; BiocGenerics = derive2 { name="BiocGenerics"; version="0.16.1"; sha256="0f16ryy5f012hvksrwlmm33bcl7lw97i2jvhbnwfwl03j4w7nhc1"; depends=[]; }; BiocInstaller = derive2 { name="BiocInstaller"; version="1.20.1"; sha256="0lsqkx8q98rix4g7wfx78fnkzmz2mjb7m9wc9zgm69m0iyp50aad"; depends=[]; }; - BiocParallel = derive2 { name="BiocParallel"; version="1.4.0"; sha256="0z1dljbq8pvkmc9pvmzh9vpshfb5gn1bvkp3zwwb7q3hy6fiiqc3"; depends=[futile_logger snow]; }; + BiocParallel = derive2 { name="BiocParallel"; version="1.4.3"; sha256="1f5mndx66vampcsq0n66afg6x851crl0h3nyv2nyp9bsgzj9cdzq"; depends=[futile_logger snow]; }; BiocStyle = derive2 { name="BiocStyle"; version="1.8.0"; sha256="03lmw649fch64kcwyps6ry9qmjz7f0ydwhc4yzkl7d6lffgfvihc"; depends=[]; }; - Biostrings = derive2 { name="Biostrings"; version="2.38.2"; sha256="1afp9szc8ci6jn0m3hrrqh6df65cpw3v1dcnl6xir3d3m3lwwmk4"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; + Biostrings = derive2 { name="Biostrings"; version="2.38.4"; sha256="0cjd7i4bdwabzb02gm753aji5xaihkj5ak8nb0d32cclxbj0hp33"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; BitSeq = derive2 { name="BitSeq"; version="1.14.0"; sha256="1q58za8jd96bk2wxy7np0b7lar3v0pk6ll833k10x1b260rvpgbp"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; }; BrainStars = derive2 { name="BrainStars"; version="1.14.0"; sha256="0r6jd6h48c15sg655079lwr9v1gl79wk8773w2q9fyfmakhj15vx"; depends=[Biobase RCurl RJSONIO]; }; BridgeDbR = derive2 { name="BridgeDbR"; version="1.4.0"; sha256="0qb1xiyq993hfzdgjaw982hhvnd9lwwdzq6anr2r9dbpzsini136"; depends=[RCurl rJava]; }; - BrowserViz = derive2 { name="BrowserViz"; version="1.2.0"; sha256="1yh80c6fk73h5sz6q494lcvv4zz5brhlzvgrppx5ihl3zvz4cwk3"; depends=[BiocGenerics httpuv jsonlite Rcpp]; }; - BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.2.0"; sha256="1h87yhcbc6gdmkzhqil7yjykjxhpcv6v2iq6z7jsfgjg7bsib4hl"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; }; - BubbleTree = derive2 { name="BubbleTree"; version="2.0.0"; sha256="135jnak07y4ih82mrql8kccbicrdir8m38kjdkqzsk5ygagcavbh"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr rainbow RColorBrewer rgl scales WriteXLS]; }; + BrowserViz = derive2 { name="BrowserViz"; version="1.2.3"; sha256="009bpkns2kbg77lpxzy3jship1yvrff72kacb8zcdyg7npn64jcz"; depends=[BiocGenerics httpuv jsonlite Rcpp]; }; + BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.2.3"; sha256="1pj9b0nhkrc3bcs36dpm2hy9lsfp2xwnrlf99b9v6n96ijki8bg9"; depends=[BiocGenerics BrowserViz httpuv jsonlite]; }; + BubbleTree = derive2 { name="BubbleTree"; version="2.0.1"; sha256="1qkvmddd7l1xg5459gd9w86d4k4rjm40c93k6piwzv8hrzr4mjzc"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer rgl scales WriteXLS]; }; BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.34.0"; sha256="0f345lsj5khgys2apjid513psx79fdpzg6vm5ndn9iw1rkgafv9f"; depends=[]; }; BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.34.0"; sha256="1i8b0s0g4yk8s99iw6bli494rbg169306b8idwl4sncjyl6mzj0c"; depends=[BufferedMatrix]; }; CAFE = derive2 { name="CAFE"; version="1.6.0"; sha256="0mmfjb93apnn39g3jrfan4zmxz7axlc6mnv6464n44kysdxyh5a4"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; }; CAGEr = derive2 { name="CAGEr"; version="1.12.0"; sha256="05hv46dqvqrw4kn9975wdbvvrk8hm07qjvx8dsdb4smaq67139kx"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; }; CALIB = derive2 { name="CALIB"; version="1.36.0"; sha256="1b21f0zg4czhk4pbd3c3vbl0p4qpw0l4wg17lm1gw4b6d6ml7jsb"; depends=[limma]; }; CAMERA = derive2 { name="CAMERA"; version="1.26.0"; sha256="0cjm98bzg5snpgd8kjj8nmk1j851rbdlidk2dbrjv373i31nf2gj"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; - CAnD = derive2 { name="CAnD"; version="1.2.0"; sha256="1z0b8xxw8hb63hxgwp919y94gkp8h9q9d7bdp06svbs78qxsglvp"; depends=[ggplot2 reshape]; }; + CAnD = derive2 { name="CAnD"; version="1.2.1"; sha256="0ncpa81ac6dzkhqnr56i4nzzipsmzy44n71z6sdhpa39rgdar2a7"; depends=[ggplot2 reshape]; }; CFAssay = derive2 { name="CFAssay"; version="1.4.0"; sha256="09bc40dck4xihksji1nmzls7qmlrgwqn2jav95x0i0461l20x2v9"; depends=[]; }; - CGEN = derive2 { name="CGEN"; version="3.6.1"; sha256="0ccsjbmsnl7k2g0hwyr2qx5dvg6acxg1qy3vkf5b3l5qm4pnsbbb"; depends=[mvtnorm survival]; }; + CGEN = derive2 { name="CGEN"; version="3.6.2"; sha256="13p2f92sh6l7bqrigqaqpcbyk3czby82r2wdr3gmz6xfwsjxkfmc"; depends=[mvtnorm survival]; }; CGHbase = derive2 { name="CGHbase"; version="1.30.0"; sha256="02q2yv7mbdjq1xby5bxydd0w6vzw9nim7ac6fb0rjpcnsxng0j82"; depends=[Biobase marray]; }; CGHcall = derive2 { name="CGHcall"; version="2.32.0"; sha256="13f3dyska147cl2q5kn42fz3d9dm8j06cmszc4ssc0i2256cp6q0"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.24.0"; sha256="08paz9ij387b8x6bg1931q553j69ajk6i3lmj2jriqjdjii8wkv1"; depends=[Biobase CGHbase CGHcall]; }; CGHregions = derive2 { name="CGHregions"; version="1.28.0"; sha256="1lnd6vwfdb1f6da4701f38vq8x4pqdp5f3p0m2j8g32qfj64vsz5"; depends=[Biobase CGHbase]; }; CMA = derive2 { name="CMA"; version="1.28.0"; sha256="1jpjfcjhxjw3ghwr7bgkwyx7lx07v0kn1pxkhb6hs2jc7fyc8jp8"; depends=[Biobase]; }; CNAnorm = derive2 { name="CNAnorm"; version="1.16.0"; sha256="06i4i4qbd0k0rs8l244igr6qrnfjsk5wqsxdc9vydxmnid15i7fk"; depends=[DNAcopy]; }; - CNEr = derive2 { name="CNEr"; version="1.6.1"; sha256="1kfcgz201766kk6vki2gaw2bjwwrcg7brxzir8d5hr3dbgxwp5ng"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; }; + CNEr = derive2 { name="CNEr"; version="1.6.2"; sha256="1ch2pwjimgrld501lfx213mbaz8a467m7mmd78ci9p2lhwyhl8xm"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; }; CNORdt = derive2 { name="CNORdt"; version="1.12.0"; sha256="1ral42sa8ha43g3bsk3f9v9lz9962rhyjpzxa5ciq9zc1s0ymwfq"; depends=[abind CellNOptR]; }; CNORfeeder = derive2 { name="CNORfeeder"; version="1.10.0"; sha256="1wgndfl1r21nrwr3gdrgz7qnnwcw5x6w55c3m5fjw6ypy8npsn1b"; depends=[CellNOptR graph]; }; CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.12.0"; sha256="0636czqfy3jyhzi8xpplzxyxi9in9qysshld6pfqbx89l0nhagvm"; depends=[CellNOptR nloptr]; }; @@ -96,45 +96,45 @@ in with self; { CNPBayes = derive2 { name="CNPBayes"; version="1.0.0"; sha256="06jw9xi0q5slh1xghgj1js5bn1gsmpag0w84cxa7qf5ls1bw4xp6"; depends=[BiocGenerics combinat foreach GenomeInfoDb GenomicRanges gtools IRanges matrixStats oligoClasses RColorBrewer Rcpp S4Vectors]; }; CNTools = derive2 { name="CNTools"; version="1.26.0"; sha256="1dc57fyi0mr8y0kx17m2cnhwzn9cyc7f4fpmn1yr34ngvaj3dw66"; depends=[genefilter]; }; CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.0.0"; sha256="0m37asnrdm7zl70j2d477lpxydnliv1d9bgb0vn0hkfrwsky5fhy"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq plyr Rsamtools xlsx]; }; - CNVrd2 = derive2 { name="CNVrd2"; version="1.8.0"; sha256="1h5n239iy77phssffdiisj7q76hwk7l5d4n0xpkdi2jsqwrqvrjc"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; + CNVrd2 = derive2 { name="CNVrd2"; version="1.8.1"; sha256="0xbibar60gm0jj5si1br26vkbw6kqf82796i3p5512wqvwfsbk8j"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; }; CNVtools = derive2 { name="CNVtools"; version="1.64.0"; sha256="1sm28sl7ghcfrgjd0d741zfy21r6vxkhj8cn510z95aa49icpd8j"; depends=[survival]; }; - CODEX = derive2 { name="CODEX"; version="1.2.0"; sha256="006dmjcd84gnagm2gfqdxwfnrq30sc3zfvqz67wl3vpg951hpjws"; depends=[GenomeInfoDb Rsamtools]; }; - COHCAP = derive2 { name="COHCAP"; version="1.8.0"; sha256="1lak57k8b8jcd21wajr1ivi1sml73fsvb6jbdz6nxgjbq7al1hgk"; depends=[WriteXLS]; }; - COMPASS = derive2 { name="COMPASS"; version="1.8.0"; sha256="0jx0fii6k0mh9hmy41jjfvsymx8b6w4l4ixsh6kj0xq8lh0rari2"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; }; + CODEX = derive2 { name="CODEX"; version="1.2.0"; sha256="006dmjcd84gnagm2gfqdxwfnrq30sc3zfvqz67wl3vpg951hpjws"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb Rsamtools]; }; + COHCAP = derive2 { name="COHCAP"; version="1.8.0"; sha256="1lak57k8b8jcd21wajr1ivi1sml73fsvb6jbdz6nxgjbq7al1hgk"; depends=[COHCAPanno WriteXLS]; }; + COMPASS = derive2 { name="COMPASS"; version="1.8.1"; sha256="1gqly197m0r9c8zbj7673ns94q3x7cwjdajv5aj714j63vmnv6fz"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; }; CORREP = derive2 { name="CORREP"; version="1.36.0"; sha256="0hjkwl2mf173mfdrziiadf5hacz6j67skizch44rxc2kfj7sbhyb"; depends=[e1071]; }; COSNet = derive2 { name="COSNet"; version="1.4.1"; sha256="0myckn066xjdm8kikqjcv1sarr8hdls1js4ak2hc97cl8is20a1r"; depends=[]; }; - CRISPRseek = derive2 { name="CRISPRseek"; version="1.10.0"; sha256="1hr4l0m6fhhfjyzd78r23k0244idbw79m4awrsx59xhmq42q1z0q"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table seqinr]; }; + CRISPRseek = derive2 { name="CRISPRseek"; version="1.10.1"; sha256="1pyif3a67z9fw3q2960sbbrb5si0xrdf04hahzm6vsqzryyvizkl"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table IRanges S4Vectors seqinr]; }; CRImage = derive2 { name="CRImage"; version="1.18.0"; sha256="04nk7xx870hzvdnx5763v2rr82314zv6ydwhv8gmxpp2lg23hsdy"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; CSAR = derive2 { name="CSAR"; version="1.22.0"; sha256="0d6adk3mq7grf8dsx822d2qf5jrdhvm551z26injic8i7v4i0s3h"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; CSSP = derive2 { name="CSSP"; version="1.8.0"; sha256="05x0agbcpns8s3vmbs7ygdny249vcahzk7sqv50nz39ap2c7i309"; depends=[]; }; CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.13.0"; sha256="0c3yjscd1jlgfl869vnv37qdb0y5gicnja1why9ws95qqgmij6zl"; depends=[AnnotationDbi limma qvalue]; }; - Cardinal = derive2 { name="Cardinal"; version="1.2.0"; sha256="0gnhn57nw93rw71y9zjdi20zldzvlcnncxjqffnm8bgbqik0g99p"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; }; - Category = derive2 { name="Category"; version="2.36.0"; sha256="0z6sj43y3wqfvkjvlk7hh08h5447bm3szcmd44y8s9lbkq954rxx"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL]; }; - CausalR = derive2 { name="CausalR"; version="0.99.12"; sha256="038raljgrdwsp8dzc5qbzbwr8j8n7dlwmx0jx8liq153l3nwp01p"; depends=[igraph]; }; + Cardinal = derive2 { name="Cardinal"; version="1.2.1"; sha256="1r3plzx39d85ipihsflliiczig3329frmxzyd2bwnmd3l91jf5dh"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; }; + Category = derive2 { name="Category"; version="2.36.0"; sha256="0z6sj43y3wqfvkjvlk7hh08h5447bm3szcmd44y8s9lbkq954rxx"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GO_db graph GSEABase Matrix RBGL]; }; + CausalR = derive2 { name="CausalR"; version="1.0.1"; sha256="0z1vv5j4q9ap54w2xf923gdjdix7xd16k6lqvk5s5vapcnyy7v3r"; depends=[igraph]; }; CellNOptR = derive2 { name="CellNOptR"; version="1.16.0"; sha256="1fig3brrc0hv48kx7lqbbykc9m2dzwy93cy70hlwqcs7b6phxq11"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; }; CexoR = derive2 { name="CexoR"; version="1.8.0"; sha256="0h0q2a9k084dycxnj5lvdqs31hqqi7iza732m7kdgsazjfk5fzxg"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; - ChAMP = derive2 { name="ChAMP"; version="1.8.0"; sha256="079ks6ds7k2mphfw73zqldi4s6zn961qkynhnqiw6fmph9gg785z"; depends=[DNAcopy GenomicRanges impute IRanges limma marray minfi plyr preprocessCore RPMM sva wateRmelon]; }; - ChIPComp = derive2 { name="ChIPComp"; version="1.0.0"; sha256="1ayg98kvh9yqj132r2fw9cdq38na64rw6rmrpqkgfj1csv4q7wiy"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; + ChAMP = derive2 { name="ChAMP"; version="1.8.0"; sha256="079ks6ds7k2mphfw73zqldi4s6zn961qkynhnqiw6fmph9gg785z"; depends=[ChAMPdata DNAcopy GenomicRanges Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest impute IRanges limma marray minfi plyr preprocessCore RPMM sva wateRmelon]; }; + ChIPComp = derive2 { name="ChIPComp"; version="1.0.0"; sha256="1ayg98kvh9yqj132r2fw9cdq38na64rw6rmrpqkgfj1csv4q7wiy"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; ChIPQC = derive2 { name="ChIPQC"; version="1.6.1"; sha256="1mw17flai6gk3sp08776sdl3mlmdq5xla7ghjq2rqk89qn5grpci"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; }; - ChIPXpress = derive2 { name="ChIPXpress"; version="1.12.0"; sha256="0k7z1ndjl869nqc0ajl437994qrfrfj5hi92h0z5qyv3vailfgsy"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; }; - ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.4.1"; sha256="0j89gnw696q9n35mwixwaisb447jqn3nvpnw8dsp5bnbqrw46qyq"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges limma matrixStats multtest RBGL regioneR S4Vectors VennDiagram]; }; - ChIPseeker = derive2 { name="ChIPseeker"; version="1.6.2"; sha256="0jkwwmqsa599shali1h8zwfavaya1zv7sal0qgj5va9rpidsv9c5"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors UpSetR]; }; - ChIPseqR = derive2 { name="ChIPseqR"; version="1.24.0"; sha256="0h98yin3hvvz38ynsgm1wky4k3ww37y39xqb2yy5swkjlg7x5hda"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; + ChIPXpress = derive2 { name="ChIPXpress"; version="1.12.0"; sha256="0k7z1ndjl869nqc0ajl437994qrfrfj5hi92h0z5qyv3vailfgsy"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; + ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.4.6"; sha256="0pgy2x80y7rxbarbczrz8ijacc1pv05c8y42a47zc4yaxg14pzfj"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicFeatures GenomicRanges GO_db graph IRanges limma matrixStats multtest RBGL regioneR S4Vectors VennDiagram]; }; + ChIPseeker = derive2 { name="ChIPseeker"; version="1.6.7"; sha256="0ffs87i1kc8ckx29rdx173fzyaiqmpw1h5rgy39dk5r6mla4xj0k"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; }; + ChIPseqR = derive2 { name="ChIPseqR"; version="1.24.1"; sha256="17v7wlkf4hblp499v90fxai710fn4syx1n3dbfa1kbiyr218gdbz"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; ChIPsim = derive2 { name="ChIPsim"; version="1.24.0"; sha256="0nazrzjpc1y88d1yj1qpmkcjnds4w6921ag7m6gypp8hwzzypqnn"; depends=[Biostrings IRanges ShortRead XVector]; }; - ChemmineOB = derive2 { name="ChemmineOB"; version="1.8.0"; sha256="1kairvbzkp5jyd49vmfyspmga3a8gy10gmg9nysim1m2i8rq83pc"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; - ChemmineR = derive2 { name="ChemmineR"; version="2.22.0"; sha256="0fza4851x3dspbdkk176vhbvknk6070fv3wwgyla8nn1d1hjxa4y"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; }; + ChemmineOB = derive2 { name="ChemmineOB"; version="1.8.2"; sha256="02bsf78skr7mi725h0qmjixlfjq456y23cyjjmkrk6wivkjd806d"; depends=[BH BiocGenerics Rcpp zlibbioc]; }; + ChemmineR = derive2 { name="ChemmineR"; version="2.22.3"; sha256="0s1hwvfpf90j74gwj1hbd4mm84qf5l0hz5wd3l1fd2jnavv4z8x8"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; }; ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.24.0"; sha256="1pjw05ig4wyh455z0xwplfl12z8mbi25k5ylwmymgm41pqy5n2a6"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; }; - ClassifyR = derive2 { name="ClassifyR"; version="1.4.5"; sha256="1bf94chklb12iyfm0ic5r0gpkj1bn6g8a7jlggpli6ad31zw5dym"; depends=[Biobase BiocParallel locfit ROCR]; }; + ClassifyR = derive2 { name="ClassifyR"; version="1.4.15"; sha256="0zxvk875y05z52mp8v09wvrxfxs8qacpcll4cg9px5pyx361fbkj"; depends=[Biobase BiocParallel locfit ROCR]; }; Clomial = derive2 { name="Clomial"; version="1.6.0"; sha256="0x6j3qjnwh31c11gq2fqyhapc5wrd9szk9bphcgsbf7n317gbf61"; depends=[matrixStats permute]; }; Clonality = derive2 { name="Clonality"; version="1.18.0"; sha256="0rx3k8c55q831dhfh5dpkl3px8jj6glx6i3la80r9krx68mbp947"; depends=[DNAcopy]; }; - CoCiteStats = derive2 { name="CoCiteStats"; version="1.42.0"; sha256="08xg3583qx0v5agsq1im5f1sna32i58mhpgvvsa0ccfnbbh9klpw"; depends=[AnnotationDbi]; }; + CoCiteStats = derive2 { name="CoCiteStats"; version="1.42.0"; sha256="08xg3583qx0v5agsq1im5f1sna32i58mhpgvvsa0ccfnbbh9klpw"; depends=[AnnotationDbi org_Hs_eg_db]; }; CoGAPS = derive2 { name="CoGAPS"; version="2.4.0"; sha256="1dl3dmhfp2sjmqnvpgpqggnzrfg1w6yf5r34al2y4yngkg8s6cds"; depends=[BH gplots RColorBrewer Rcpp]; }; CoRegNet = derive2 { name="CoRegNet"; version="1.6.0"; sha256="0ynizawrygpka2isldbfmnlz1zqczx2fv1kbvz1lbm9qwbpj7rn4"; depends=[arules igraph shiny]; }; - CompGO = derive2 { name="CompGO"; version="1.6.0"; sha256="0n84z3mhg6zb3yafz0803g6cggzpbw31fn933q9bg7pybij0nf1p"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; }; + CompGO = derive2 { name="CompGO"; version="1.6.0"; sha256="0n84z3mhg6zb3yafz0803g6cggzpbw31fn933q9bg7pybij0nf1p"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; }; ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.6.0"; sha256="113l7ykgxqnrbr4rz3cpa39k3n6i67zkxindcacpv35pncmasi6c"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; }; - ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.24.0"; sha256="13fy6qzqnph6xlbkshz2x8n20s5fhx6agawqb1wpvpvh4gcpa6g3"; depends=[Biobase cluster]; }; + ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.24.0"; sha256="13fy6qzqnph6xlbkshz2x8n20s5fhx6agawqb1wpvpvh4gcpa6g3"; depends=[ALL Biobase cluster]; }; CopyNumber450k = derive2 { name="CopyNumber450k"; version="1.6.0"; sha256="0z4v6x140gzaxf06a73d2qd6dp8gvq62l8xb7bii21r7n089m14i"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; }; - CopywriteR = derive2 { name="CopywriteR"; version="2.2.0"; sha256="0hmww433hyg4wgi2hx49mwrd4y65myyi00akys3mhdsxn3s0al13"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; + CopywriteR = derive2 { name="CopywriteR"; version="2.2.0"; sha256="0hmww433hyg4wgi2hx49mwrd4y65myyi00akys3mhdsxn3s0al13"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; CorMut = derive2 { name="CorMut"; version="1.12.0"; sha256="0ldqw4g15i4r1nv74msn97c75wcr1nvwk1ffnkafvnc8bwcfzfmy"; depends=[igraph seqinr]; }; Cormotif = derive2 { name="Cormotif"; version="1.16.0"; sha256="0kx4h5c3vqr0x7swgq7fbkfqpknkapvqwvfmk42yh26vlabaf9cr"; depends=[affy limma]; }; CoverageView = derive2 { name="CoverageView"; version="1.6.0"; sha256="0z3z2s5p1xrc04gzmmry3n9qqk4cam2p7pw7mak8kiswdraba7iz"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; @@ -143,78 +143,78 @@ in with self; { DASiR = derive2 { name="DASiR"; version="1.10.0"; sha256="1by2655qvskzynvbh47vydm6nl2cmnfqqs25453k29n672a6yyw4"; depends=[Biostrings GenomicRanges IRanges XML]; }; DAVIDQuery = derive2 { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; }; DBChIP = derive2 { name="DBChIP"; version="1.14.0"; sha256="1x876cv2j0bdb7jflm663bp7xk32rsxpf9jwwskbl8r4r1ffsapa"; depends=[DESeq edgeR]; }; - DChIPRep = derive2 { name="DChIPRep"; version="1.0.3"; sha256="1rws6khk4jn5bg1vqjk48v66anqd516w4aglin7czn0sxs2hhjy0"; depends=[assertthat DESeq2 fdrtool GenomicRanges ggplot2 plyr reshape2 S4Vectors smoothmest tidyr]; }; - DECIPHER = derive2 { name="DECIPHER"; version="1.16.0"; sha256="1916xhv89abjrf166fhhhy62v67dc7frd1ff59nnz8w32xx663cw"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; + DChIPRep = derive2 { name="DChIPRep"; version="1.0.4"; sha256="0cwggkpbza25r2yssyhs9zkwzncmxkd406k2sn2y0rq1kdi08hj2"; depends=[assertthat DESeq2 fdrtool GenomicRanges ggplot2 plyr reshape2 S4Vectors smoothmest tidyr]; }; + DECIPHER = derive2 { name="DECIPHER"; version="1.16.1"; sha256="0bh3c0v3fpvb9k7n3d405615hgp08fq463xlc67wz9h3l47wjrh7"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; DEDS = derive2 { name="DEDS"; version="1.44.0"; sha256="079c3in183ybp0c46hqh99grqmbshsnrcax3qz08z5xbc394azna"; depends=[]; }; DEGraph = derive2 { name="DEGraph"; version="1.22.0"; sha256="0bjyvw218f8z0qn655idvrhg79jshya9qprmlwy28h81cn548pm8"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; }; DEGreport = derive2 { name="DEGreport"; version="1.6.1"; sha256="09srzwgjqwbadxj7a7rs1dylyqm8k7f4hjrhsb3k06nsbjfbfyd0"; depends=[edgeR ggplot2 Nozzle_R1 plyr quantreg]; }; DEGseq = derive2 { name="DEGseq"; version="1.24.0"; sha256="0yzi6bil4qj85qxa843j3s6m6qb33gy73s6fyap94cjqj72v6809"; depends=[qvalue samr]; }; - DESeq = derive2 { name="DESeq"; version="1.22.0"; sha256="0qv9wn9h2wird3x6vx6kzvv3h5js5ms0qj2cm48kgscykzxwhrw9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; - DESeq2 = derive2 { name="DESeq2"; version="1.10.0"; sha256="0ny22bjmxda2psffwsnj63c8r2p7vhah33ghnd0ylm90gr6ilvnx"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; - DEXSeq = derive2 { name="DEXSeq"; version="1.16.2"; sha256="016h2xb5s6s9zbiy6c3q9snb8hv7qdgwn4kw4zq42a38plw0mkl5"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; }; + DESeq = derive2 { name="DESeq"; version="1.22.1"; sha256="14rc1zcn4a7hkm43ca9js5ffhcm3awjrpl5bx66fj3szibjnnzcb"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; + DESeq2 = derive2 { name="DESeq2"; version="1.10.1"; sha256="0f3jz578z83bzlqv27vhbcrz4lab6qycf6dy4cdfgvybx1k35dn9"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.16.10"; sha256="0rz2zvwwc13zjxlfqv38kx1kid6qqsii5gflhaaa4xgp8qk3y9f1"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; }; DFP = derive2 { name="DFP"; version="1.28.0"; sha256="186f8lkw7c37mxixp8qa0xg21c47yf6da1l80k7ngdan86q80cs2"; depends=[Biobase]; }; DMRcaller = derive2 { name="DMRcaller"; version="1.2.0"; sha256="1rkzbfaa7bx3bpfdppx3xzrpxinmgj1frzxird966xk2b40m4bd4"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; - DMRcate = derive2 { name="DMRcate"; version="1.6.0"; sha256="0axjxb19wfllmvfjxnnfyn545xil0076qinzlg968kp4qc48ydm6"; depends=[limma minfi]; }; + DMRcate = derive2 { name="DMRcate"; version="1.6.52"; sha256="0nvwh7jd62yh5v12s1b71797zawkaj3x4ibmgmzisg8zkxpl8fwq"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi plyr]; }; DMRforPairs = derive2 { name="DMRforPairs"; version="1.6.0"; sha256="0b5mkhb5gkvfccvpgvklb3ksnq9gv6napcvxzcrph46nmm11i8zc"; depends=[GenomicRanges Gviz R2HTML]; }; DNABarcodes = derive2 { name="DNABarcodes"; version="1.0.0"; sha256="1wc2rcd7bc2yawm20frnx6xrkflglkcc9l27l91l349pdgsidcpm"; depends=[BH Matrix Rcpp]; }; DNAcopy = derive2 { name="DNAcopy"; version="1.44.0"; sha256="1c1px4rbr36xx929hp59k7ca9k5ab66qmn8k63fk13278ncm6h66"; depends=[]; }; - DOQTL = derive2 { name="DOQTL"; version="1.6.0"; sha256="0sl7a1hhszrfxn52iw7cz6sl38y7mwk4giw3a7kqj22f1p6bhc6y"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; - DOSE = derive2 { name="DOSE"; version="2.8.1"; sha256="0afawq9ig85y5ivgbyavfzina4l4jjlzzdhyjahx4y9wdjy6210f"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; }; + DOQTL = derive2 { name="DOQTL"; version="1.6.0"; sha256="0sl7a1hhszrfxn52iw7cz6sl38y7mwk4giw3a7kqj22f1p6bhc6y"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; + DOSE = derive2 { name="DOSE"; version="2.8.2"; sha256="1mbp55swmnb8ag5c8cz30wxrr0xiwhrbl6z6r6ls20cvldzc2dfa"; depends=[AnnotationDbi DO_db ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; }; DSS = derive2 { name="DSS"; version="2.10.0"; sha256="06a7cs9i12p9zfv52hl4v3fll4dhaapjhq6fqc58mqlzfa8qlwdm"; depends=[Biobase bsseq]; }; DTA = derive2 { name="DTA"; version="2.16.0"; sha256="1j3dab7w9nqnbxyckwxhm733dvpdqyg22h60ipijyjwq2d1l8znc"; depends=[LSD scatterplot3d]; }; DeMAND = derive2 { name="DeMAND"; version="1.0.0"; sha256="1dcq5hvpdaihagg1rasbrhamaf938zh5b1lh7ynd0q52qpr5fm56"; depends=[KernSmooth]; }; DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.12.0"; sha256="1dnq44l20b2n9skyz9kl4dck5vlir2jiyy265jgvgw4xji1gwi7l"; depends=[ggplot2 limSolve pcaMethods]; }; - DiffBind = derive2 { name="DiffBind"; version="1.16.0"; sha256="0grg9wbdjb9ci2h3npkya3rzj5r3q083plkly0myr1y5cn73aw0v"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; }; + DiffBind = derive2 { name="DiffBind"; version="1.16.3"; sha256="1mgnjfd3k5d44lzlzs4wms7mljbfrpqcs50g7jj4wk8y7jb21qyx"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; }; DiffLogo = derive2 { name="DiffLogo"; version="1.0.0"; sha256="10p93wwndvr2y4mfnh7y23gyr9i7lskgp1sa43261s4zjhynsp1k"; depends=[cba]; }; - DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.12.0"; sha256="1vlpd8pqzd86h13gn753444sx6jjgvd65asf58iyjhwy3izivakz"; depends=[IRanges S4Vectors]; }; + DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.12.1"; sha256="1izxlcj4niyj2f4wqfjpajrki7lggr1xd8kvjmhmbqz1p932rryf"; depends=[IRanges S4Vectors]; }; DriverNet = derive2 { name="DriverNet"; version="1.10.0"; sha256="15iimcjdj28nbiksc9v6gw2i9mpkvbwkk8zcia1b7yklwb33assp"; depends=[]; }; - DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x7kkmp47743aq0pp71wamnf5gsk6bhz6rdvswzb12iyqk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt GEOquery limma qvalue RUnit xtable]; }; + DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.10.2"; sha256="168dajb9ism63k4kgj37b6znkia3ch6p3rzbzzjy3qbyyazzd9b2"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; }; DupChecker = derive2 { name="DupChecker"; version="1.8.0"; sha256="0p75kq178mls765q2v22bj7a727hb1v5rj4wkcagxavcls92vg0p"; depends=[R_utils RCurl]; }; DynDoc = derive2 { name="DynDoc"; version="1.48.0"; sha256="098idkx8m01gy0rylh67v5qnbx8bplyymc9il5sfpdv1hpc9abm3"; depends=[]; }; EBImage = derive2 { name="EBImage"; version="4.12.2"; sha256="1p49dap5nn9nwpglssl7fmlgvi1a1k0cpzdxph6x82kcm346srn4"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; }; EBSeq = derive2 { name="EBSeq"; version="1.10.0"; sha256="19slkx8b9p54vg4d3895kjsz4gij9pag1i3f351ypn0yx19skb80"; depends=[blockmodeling gplots testthat]; }; EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.4.0"; sha256="02ba8famhbp4nxkg8jkwzs63qkfi7hi03h6w1igl2xn2343fnla3"; depends=[EBSeq]; }; EBarrays = derive2 { name="EBarrays"; version="2.34.0"; sha256="06kh68i7fjbi99rl8jp9vhbpywsr0x0fmyny83gzkbr192c8dvdw"; depends=[Biobase cluster lattice]; }; - EBcoexpress = derive2 { name="EBcoexpress"; version="1.14.0"; sha256="1w6d2kp07p4vfyp1wl25z62kphccd5q3dahlh8qpvw824mjyzb04"; depends=[EBarrays mclust minqa]; }; - EDASeq = derive2 { name="EDASeq"; version="2.4.0"; sha256="1bs70vqkwzzpg2g8pk87yj8bmn0i48gaz2cc5mpzjlfdas86hbhi"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; + EBcoexpress = derive2 { name="EBcoexpress"; version="1.14.1"; sha256="1xdgzw4pik02mzs6h4fv3x3z4kgmz2am7562b7q83ppv4hr2qjgq"; depends=[EBarrays mclust minqa]; }; + EDASeq = derive2 { name="EDASeq"; version="2.4.1"; sha256="1jjk36sjbxs4sa2j87bayi5prgk3zmkc9vnm0grj9lgjdm6ficbb"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; }; EDDA = derive2 { name="EDDA"; version="1.8.0"; sha256="0gqgq57a11k7iygjyf3bszx8gm90a8frabmzib7kk84k3wrvynqg"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; }; ELBOW = derive2 { name="ELBOW"; version="1.6.0"; sha256="1kpprsv1s08qks10raqdh82c9w8dg0saxa1ahhnk1a2whzxj0n3m"; depends=[]; }; - ELMER = derive2 { name="ELMER"; version="1.2.0"; sha256="0dxg6sy0nyizkxga66a1aaprbyqdh2djhiddzyqnhwb0zkr6x6nz"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges minfi reshape S4Vectors]; }; + ELMER = derive2 { name="ELMER"; version="1.2.1"; sha256="0ppr30l43fiak0x798w3i2w1as1gycxnd34iplm1i39lzsdni7z4"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; }; EMDomics = derive2 { name="EMDomics"; version="2.0.0"; sha256="13rcbkyyk1l6xqklmws1ilnzyhal7g99499rnh0wlxbrwsb9n51w"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; - ENCODExplorer = derive2 { name="ENCODExplorer"; version="1.2.0"; sha256="15gf9vb56xj3nksiak4yaxz16zqs5ry5kjqhg2papc56f09yq223"; depends=[jsonlite RSQLite]; }; + ENCODExplorer = derive2 { name="ENCODExplorer"; version="1.2.1"; sha256="18m42w9amjxz3d50zx5p7nvjc4kjbqhlmrqcnxy4jfyzm7sm7qby"; depends=[jsonlite RSQLite]; }; ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.18.0"; sha256="1fyp6qyvw5cbapnpjx1s86pss2xhv98s4lqxfxwrsng6p1jh5z89"; depends=[rJava XML]; }; ENmix = derive2 { name="ENmix"; version="1.4.1"; sha256="191mm9pn53sys62736qf8kn84jxr9x5r39j4qbwyqq32gsjvq6ji"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; }; EasyqpcR = derive2 { name="EasyqpcR"; version="1.12.0"; sha256="0s0ir8bpj3fwg79mzqz57c0crkqqq7hywiwyihcz2cykhsm1r11g"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; }; EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.0.0"; sha256="02mdn7isc58fznm55qxfp1an19wfl3kj509467c9r10b5zl5mglk"; depends=[ComplexHeatmap GenomicRanges IRanges locfit matrixStats]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.0.0"; sha256="06dzlqkfydfzxhwqlrfk8j2xqglb08mc4xb7ik0jvh7yfrp91q0w"; depends=[AnnotationDbi Biobase biocGraph biomaRt ComplexHeatmap DESeq2 EDASeq edgeR geneplotter graph GSEABase hwriter KEGGgraph KEGGREST limma MASS mixtools neaGUI npGSEA PathNet pathview ReportingTools Rgraphviz S4Vectors safe SparseM SPIA stringr SummarizedExperiment topGO]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.0.14"; sha256="1sia76zmcpb8r3fq136ilcpnwpsa3myl385b3k2kc3hpqchi0rj1"; depends=[AnnotationDbi Biobase biocGraph biomaRt ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS mixtools neaGUI npGSEA PathNet pathview ReportingTools Rgraphviz S4Vectors safe SparseM SPIA stringr SummarizedExperiment topGO]; }; ExiMiR = derive2 { name="ExiMiR"; version="2.12.0"; sha256="0c37jkych7pgahfdbwqqffg6746cfxwv7q10pqpnjsdg075pw8q9"; depends=[affy affyio Biobase limma preprocessCore]; }; - ExpressionView = derive2 { name="ExpressionView"; version="1.22.0"; sha256="1gwhz8q5kyi01jwlwpd39dp292pc6k4v1w0al4653151qb5m55ja"; depends=[AnnotationDbi bitops caTools eisa isa2]; }; - FEM = derive2 { name="FEM"; version="2.6.0"; sha256="1pwbn2igwrd50wn8402f3zwd22h4c8anjmbrls2i6h86ardl046f"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix]; }; + ExpressionView = derive2 { name="ExpressionView"; version="1.22.0"; sha256="1gwhz8q5kyi01jwlwpd39dp292pc6k4v1w0al4653151qb5m55ja"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; }; + FEM = derive2 { name="FEM"; version="2.6.0"; sha256="1pwbn2igwrd50wn8402f3zwd22h4c8anjmbrls2i6h86ardl046f"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; }; FGNet = derive2 { name="FGNet"; version="3.4.0"; sha256="0pvzy185wqd9rnzc2py92zmpxywi8ysk9a7dh3415m748knw4rz8"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; FISHalyseR = derive2 { name="FISHalyseR"; version="1.4.0"; sha256="0vn83slaaphw9nxp7yp6v8xp5n6kqd2zzvv7v4bn9jfi4cskxbib"; depends=[abind EBImage]; }; FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.6.0"; sha256="05q3cbm9v9wq0av607gx526989a88lsbdaaskgac4dcfwwb6s5xy"; depends=[fda MASS]; }; - FindMyFriends = derive2 { name="FindMyFriends"; version="1.0.2"; sha256="1w55grk5x4jik7g015wv48v7dpkk86dbaq21ni44zzvqiw0lwc9q"; depends=[Biobase BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; + FindMyFriends = derive2 { name="FindMyFriends"; version="1.0.7"; sha256="0ga0iwscbcczysldizgp8g19gsyszfw4vgbgs45q9px95603z0cg"; depends=[Biobase BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.2.0"; sha256="1y1y7g9111z55cwi2ph44yqib41234g77xwsybk6irlq1anizz7p"; depends=[RCurl XML]; }; FlowSOM = derive2 { name="FlowSOM"; version="1.2.0"; sha256="019qzh7h0bygxi4b4si1zxavx99121has7jry7swkglwss2qx0ri"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; }; FourCSeq = derive2 { name="FourCSeq"; version="1.4.0"; sha256="1xh0l90hp6jy9j0xkh78dm9kyk90zzlg04yfrzd4v12mwljs8r19"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; }; - FunciSNP = derive2 { name="FunciSNP"; version="1.12.0"; sha256="1125ismkp2sprshv4b39l6bycdlry3933jaliva17c0bgjr27jhm"; depends=[AnnotationDbi ChIPpeakAnno GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer scales snpStats VariantAnnotation]; }; + FunciSNP = derive2 { name="FunciSNP"; version="1.12.0"; sha256="1125ismkp2sprshv4b39l6bycdlry3933jaliva17c0bgjr27jhm"; depends=[AnnotationDbi ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges org_Hs_eg_db plyr reshape Rsamtools rtracklayer scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; GENE_E = derive2 { name="GENE.E"; version="1.10.0"; sha256="1czm1j144i842d7lf01c9gmyifikp4a66sq49i7rgpzbiz3pndkf"; depends=[RCurl rhdf5]; }; - GENESIS = derive2 { name="GENESIS"; version="2.0.0"; sha256="0s8lx62yl6paxggh80qgc6q3imgjp3qzw7awadd6kw2wn69avz39"; depends=[gdsfmt GWASTools]; }; + GENESIS = derive2 { name="GENESIS"; version="2.0.1"; sha256="1v8d114z6sbqqvf4sbw3wzifzqrig2yjmppmq0jnjyrjag3ph1ab"; depends=[gdsfmt GWASTools]; }; GEOmetadb = derive2 { name="GEOmetadb"; version="1.30.0"; sha256="1jw4n5p7vd75qhz7r7ll6ydsdrgmrclb8p0sks4xz3l87cd03pb3"; depends=[GEOquery RSQLite]; }; GEOquery = derive2 { name="GEOquery"; version="2.36.0"; sha256="18scw6jx4z7zab653if686cn1kyy0v2i7dfvvxb05wsrj7blmai1"; depends=[Biobase RCurl XML]; }; - GEOsearch = derive2 { name="GEOsearch"; version="1.0.0"; sha256="0z03pjswqdy4iw88x9cfjiikr9rwibwcw4443b18q2aqnp4yn83r"; depends=[]; }; + GEOsearch = derive2 { name="GEOsearch"; version="1.0.1"; sha256="1zag3rg2cfs0zfh092rzwhshnkncrv2p88flz9hy2n350k1xnyc4"; depends=[org_Hs_eg_db org_Mm_eg_db]; }; GEOsubmission = derive2 { name="GEOsubmission"; version="1.22.0"; sha256="0djm7r2g2c0k5img45v9a56gfppx0qwfla8di01fvphlwag21gi1"; depends=[affy Biobase]; }; GEWIST = derive2 { name="GEWIST"; version="1.14.0"; sha256="0k6zk4g0rsfjvf30sx588xfrvi31vwnh5fysz9rigbkvrhayv12r"; depends=[car]; }; GGBase = derive2 { name="GGBase"; version="3.32.0"; sha256="15vvwigv9xy87dl2c795c3abpnrzr364m4sbslmns403rg8dpsiw"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; }; GGtools = derive2 { name="GGtools"; version="5.6.0"; sha256="1ndvlyfzjn519z9zh6kf5sdjaz3ckracgyf2lxp23nchm2311lf0"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; }; GLAD = derive2 { name="GLAD"; version="2.34.0"; sha256="18ahik48499j6yf6h7k8f05s7w50b5fzs2hcz33zz36mlppz4xnr"; depends=[]; }; - GOFunction = derive2 { name="GOFunction"; version="1.18.0"; sha256="00pdxf24sxdnh31h69c5zjhl1j2jv1ag91ay3a9w62p07bcg82l6"; depends=[AnnotationDbi Biobase graph Rgraphviz SparseM]; }; - GOSemSim = derive2 { name="GOSemSim"; version="1.28.1"; sha256="13vyz35fpbax47p6q4db8s109mzksq8bzgdwvh5adchd7h0m5wqk"; depends=[AnnotationDbi Rcpp]; }; - GOSim = derive2 { name="GOSim"; version="1.8.0"; sha256="14dyazr7p9p7h1cckbmd5yjj76718lqgfnqbcrrz52qyk0dqz6wx"; depends=[annotate AnnotationDbi cluster corpcor flexmix graph Matrix RBGL Rcpp topGO]; }; + GOFunction = derive2 { name="GOFunction"; version="1.18.0"; sha256="00pdxf24sxdnh31h69c5zjhl1j2jv1ag91ay3a9w62p07bcg82l6"; depends=[AnnotationDbi Biobase GO_db graph Rgraphviz SparseM]; }; + GOSemSim = derive2 { name="GOSemSim"; version="1.28.2"; sha256="04qyxy9adqk37hwgnx4kqa8p8fsrl1d1cf0cc9y2mq6wxq0ilw27"; depends=[AnnotationDbi GO_db Rcpp]; }; + GOSim = derive2 { name="GOSim"; version="1.8.0"; sha256="14dyazr7p9p7h1cckbmd5yjj76718lqgfnqbcrrz52qyk0dqz6wx"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; }; GOTHiC = derive2 { name="GOTHiC"; version="1.6.0"; sha256="0fbrflqyfihks23mxmqn8v4mm5m1ff4zzg52lfxdz3an72mvznv6"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges rtracklayer S4Vectors ShortRead]; }; GOexpress = derive2 { name="GOexpress"; version="1.4.1"; sha256="16ckxdlzsx8p2qli55008j59xf88yf7b62z3nilxh5fvnr92900w"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; }; - GOstats = derive2 { name="GOstats"; version="2.36.0"; sha256="0jxzlipz27pm2iijgiczpnjlda9fj8y00sbbksyyr3i1rjx72vp5"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category graph RBGL]; }; - GOsummaries = derive2 { name="GOsummaries"; version="2.4.0"; sha256="0431dpkm6j65mvzdpr7zdynbkqy7xvbha21qg64w7kw2j6zjpaqb"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; + GOstats = derive2 { name="GOstats"; version="2.36.0"; sha256="0jxzlipz27pm2iijgiczpnjlda9fj8y00sbbksyyr3i1rjx72vp5"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; }; + GOsummaries = derive2 { name="GOsummaries"; version="2.4.5"; sha256="0qbvgg1g17dxrn80smrd0ab0mk63xbzv8zrrdrlwd4fdvr0ysc96"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; }; GRENITS = derive2 { name="GRENITS"; version="1.22.0"; sha256="1i1mbc7sd0irc0da0pz876dibvyx451h9475hlq9ydw6q04kfjzq"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; GSAR = derive2 { name="GSAR"; version="1.4.0"; sha256="0l0vid5ba3yj8ywdj904zvm6gyvig1drxvr1b4xidyd0g0fpl6a9"; depends=[igraph]; }; GSCA = derive2 { name="GSCA"; version="1.8.0"; sha256="06pjmi5xc8hld09pmw87lwk5wa7cyd9qb2h32qmblc56wai7qxny"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; }; @@ -224,7 +224,7 @@ in with self; { GSReg = derive2 { name="GSReg"; version="1.4.0"; sha256="1qq0lrx2mvwzf7s4v8i162fpb68njm5sscz4h22hyskdxrjkk8vp"; depends=[]; }; GSVA = derive2 { name="GSVA"; version="1.18.0"; sha256="1w17a5d4vd4gibg88npbx86pmcg7wzqnih1a3g4mpvld0wf2xs8q"; depends=[Biobase BiocGenerics GSEABase]; }; GUIDEseq = derive2 { name="GUIDEseq"; version="1.0.4"; sha256="03hswcshnvb7pmacxnx6lrqqy6fxprjkv9sydjkca5nvd84i7bdz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomicRanges IRanges matrixStats S4Vectors]; }; - GWASTools = derive2 { name="GWASTools"; version="1.16.1"; sha256="09zkwh5zcrfss2kdj81jdcs6i9i123xis3myj73f4si74bd1dq83"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; }; + GWASTools = derive2 { name="GWASTools"; version="1.16.1"; sha256="09zkwh5zcrfss2kdj81jdcs6i9i123xis3myj73f4si74bd1dq83"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; GeneAnswers = derive2 { name="GeneAnswers"; version="2.12.0"; sha256="1gacvc1vd0sl6jn0r14w4n37hsrmx6m5k1l7d2a5m3qssyk6l6n3"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; GeneBreak = derive2 { name="GeneBreak"; version="1.0.0"; sha256="0bzb1wzj9jj069x6ikns4743h5kc4nmdf5j7mm2w2lrfa1x1v1dd"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.16.0"; sha256="1vb7qj2pgg8s51c43y12r1ar68jdaf3xrmmwvq8r182ky3cs45j7"; depends=[Biobase PGSEA]; }; @@ -239,22 +239,22 @@ in with self; { GeneticsPed = derive2 { name="GeneticsPed"; version="1.32.0"; sha256="0ysrjrs30kqcfafjc5wzz2f4w59jhfk5ywyzn8rgagajvdzcg6z4"; depends=[gdata genetics MASS]; }; GenoView = derive2 { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; }; GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.30.0"; sha256="1wkjcg6w95wlrdgaskc3xndl0azmxhxnsipf9qrj057gf2rpx7zf"; depends=[biomaRt]; }; - GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.6.1"; sha256="1j2n1v1mrw1fxn7cyffz112pm76wd6gy9q9qwlsfv3brbsqbvdbf"; depends=[BiocGenerics IRanges S4Vectors]; }; - GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.6.1"; sha256="03pxzkmwcpl0d7a09ahan0nllfv7qw2i7w361w6af2s4n3xwrniz"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.22.5"; sha256="1xsddq2py8aj740gj1hi7h0ah94h85snsgcffy3aazriaa7cimay"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; - GenomicFiles = derive2 { name="GenomicFiles"; version="1.6.0"; sha256="0llgwx8yi484szjha9klk4l2bzda3ghjr0b9wd7wnhf6cpi33p41"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.4.0"; sha256="10sq5lbzvw4kn9gbbj833bx6d4x0b5hgbq1vcvb0s6b3li891ic2"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools S4Vectors stringr]; }; - GenomicRanges = derive2 { name="GenomicRanges"; version="1.22.1"; sha256="1rgqzax2w0jy7bd3b8wfglg8b9lmbnjjzkrm38zd42dsa5gmddbr"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; - GenomicTuples = derive2 { name="GenomicTuples"; version="1.4.0"; sha256="1bp8m960dfffaw8nbzz035b07lhp48z8lcjq23n6ima76qh5x4iw"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.6.3"; sha256="1ggp005n2rlkad00ilzn95y4rd484yr1chdhnd6fwg45rbi94d63"; depends=[BiocGenerics IRanges S4Vectors]; }; + GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.6.3"; sha256="02b9j1pfd39bkvb623k5k0ziq9rpw093hifqw65vb954dwj29jhd"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.22.13"; sha256="0n3rkj66la6wizgcsf2rmwcsyfxz9kv5zak337lmk1raqfnancz4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFiles = derive2 { name="GenomicFiles"; version="1.6.2"; sha256="14f3zw2vxmb3b6gxxvdvfj34hxp3b3n4k6qx80ycw8kpdr5r73n4"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; + GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.4.2"; sha256="1a8b57dxla9hqzdn22jxb3ivl3i2xz41abrb7mgkxphgv55jf190"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools S4Vectors stringr]; }; + GenomicRanges = derive2 { name="GenomicRanges"; version="1.22.4"; sha256="02df5683nrpn9d10ws8jz9b55nr9055hh882xp2i154xdddir0k0"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; + GenomicTuples = derive2 { name="GenomicTuples"; version="1.4.5"; sha256="0aiyk5hd6i6j5f2lp72nyqh8arp41aadzamdgkghwmnxhipm3czs"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; Genominator = derive2 { name="Genominator"; version="1.24.0"; sha256="1rqzxbji5wh6dshjsprj1mzps08l07gxmjir9naj6lsj2q0xhn9p"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; }; GlobalAncova = derive2 { name="GlobalAncova"; version="3.38.0"; sha256="011yf2bng9qb7rgds670ranp9z5qm569405qpk5y6xb9rvnpnxy3"; depends=[annotate AnnotationDbi corpcor globaltest]; }; GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.2.0"; sha256="1z87jmd5vzg5v93bv9k3998wqhnk5p2v9d2qr9g0xxjvxw2q78fm"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; GraphAT = derive2 { name="GraphAT"; version="1.42.0"; sha256="036g6cc9r96jgj7nhlgmq0jn553hajyalwibkdnw7qy88d45c8qz"; depends=[graph MCMCpack]; }; GraphAlignment = derive2 { name="GraphAlignment"; version="1.34.0"; sha256="0af3m51zs35v84h4vj02fwm50iw2rk32jrixdbcw033ispl7wrkv"; depends=[]; }; - GraphPAC = derive2 { name="GraphPAC"; version="1.12.0"; sha256="00h0ivx02vz0mjlnlvnjg6wqfv4r35c0zwlb5s8hfa1sf5fw68d2"; depends=[igraph iPAC RMallow TSP]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.12.1"; sha256="1fa64jam3cl1khv8jspwjb9myifmgx0kwg0b601bia578bjcdj7d"; depends=[igraph iPAC RMallow TSP]; }; GreyListChIP = derive2 { name="GreyListChIP"; version="1.2.0"; sha256="0pnyk05fri2pgin9ppyq2lk5rsc4cays5za6vhgdsjvv08sxyykz"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; }; Guitar = derive2 { name="Guitar"; version="1.7.0"; sha256="0ld2ghyq3f02as01jzwkbc0wbly1g40bqy5mmvvrj87b8l235h10"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; - Gviz = derive2 { name="Gviz"; version="1.14.0"; sha256="06ddj9lyg3ja597ai53nk1li1hpc65dbvj2gb51pq9xhxlpgdxa7"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; + Gviz = derive2 { name="Gviz"; version="1.14.4"; sha256="16vca86mrpl2m9w0456cj7wj6dhdg0iqxj3z9dlia5wh56p00ryp"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; HCsnip = derive2 { name="HCsnip"; version="1.10.0"; sha256="0x4lpx13bhr2w5yhrcsc89g0x4q1dy0j588h210ziizgh67qqcrs"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; }; HDTD = derive2 { name="HDTD"; version="1.4.0"; sha256="0d3aycz0j34iqg8xqqnga8x6ynwn0b551qizpqby8j5whlrgdw76"; depends=[]; }; HELP = derive2 { name="HELP"; version="1.28.0"; sha256="0m5hk3215q2gr59agzjzdbqkxkf292injxrn1ji1n29vbfzjhd41"; depends=[Biobase]; }; @@ -263,34 +263,34 @@ in with self; { HMMcopy = derive2 { name="HMMcopy"; version="1.12.0"; sha256="1l0ynzk8cg9i1dcb2q724p0gk0gxcrcmr9ndlvjm1jq9f2cd9lma"; depends=[geneplotter IRanges]; }; HTSFilter = derive2 { name="HTSFilter"; version="1.10.0"; sha256="0yfmjn1hq2dr8bh3f77kl0i4md18q4l6sfpvlsi7bf12r9cg3677"; depends=[Biobase DESeq DESeq2 edgeR]; }; HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.22.0"; sha256="01mb273v1i9k0d2gbl9mpmr4rrnx49s3srv0yh1znvmwx0hmfyq2"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; }; - HTSeqGenie = derive2 { name="HTSeqGenie"; version="3.20.0"; sha256="0k03764g9wi8wlx4lg0lpyb7h8aqzi5y9d2wf1jbg20dk81brbzw"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead VariantAnnotation VariantTools]; }; + HTSeqGenie = derive2 { name="HTSeqGenie"; version="3.20.1"; sha256="0bg86jiv45899gw9x4hhvqf525vfwkzj2b5jk7026cq5vmjc0k5j"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead VariantAnnotation VariantTools]; }; HTqPCR = derive2 { name="HTqPCR"; version="1.24.0"; sha256="1bjnirp3ha5ymnv1xyh02d77w7gp36qk62gjfzkbsnhwbwajpdkx"; depends=[affy Biobase gplots limma RColorBrewer]; }; Harshlight = derive2 { name="Harshlight"; version="1.42.0"; sha256="1b2ggv680ckj0350a2y36vlm1dszk5gx3b60qf61cqb8a0mzcyb4"; depends=[affy altcdfenvs Biobase]; }; Heatplus = derive2 { name="Heatplus"; version="2.16.0"; sha256="1mp31d9gd313kzx2d6nymapqxhzpd8n15li5xl52wq10w574lpc0"; depends=[RColorBrewer]; }; HiTC = derive2 { name="HiTC"; version="1.14.0"; sha256="0vdlj9jslvqx73d766bn9zr8drnhd334n053xmc340s2vjs7s4nq"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; HilbertCurve = derive2 { name="HilbertCurve"; version="1.0.0"; sha256="03yb9w4qn7c1p4yvgkcf6bjq3ms52w9jydknjryzf65gciy9m2mj"; depends=[GenomicRanges HilbertVis IRanges png]; }; HilbertVis = derive2 { name="HilbertVis"; version="1.28.0"; sha256="1shs6frmbfvkl8pg1nbiqlm5i9ngq6pin67gkxs5v8xw5q9rk7ya"; depends=[lattice]; }; - HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.28.0"; sha256="0nvg7zakp92fi9x1alvqp5mzv4vlqsg9ayvq0lknk8gc7k72y694"; depends=[HilbertVis]; }; + HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.28.1"; sha256="1hqfjy4c4vqyz62ycia8b696cglqxbav97cxbivd6f8a578a4d5f"; depends=[HilbertVis]; }; HybridMTest = derive2 { name="HybridMTest"; version="1.14.0"; sha256="0mgdqp6s7lfywxqymap27lbz6hgmq6rczmy2dnhdk2wwl96gp68k"; depends=[Biobase fdrtool MASS survival]; }; IMPCdata = derive2 { name="IMPCdata"; version="1.4.0"; sha256="06ch3cp15ffch82gdqiwnnlakshdl2mmvq99c9iq5prp89vk41d6"; depends=[rjson]; }; INPower = derive2 { name="INPower"; version="1.6.0"; sha256="1jdsvglgipmzjjaz972b7xbcykynck4326r8d5bxm8yh2hv7nshv"; depends=[mvtnorm]; }; INSPEcT = derive2 { name="INSPEcT"; version="1.0.0"; sha256="0a7jkw4wlp05aknzc9mf9r3kfrzgmhdjmykp796s3cyjjxksk74j"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; }; - IONiseR = derive2 { name="IONiseR"; version="1.0.0"; sha256="0i5d3pcbd5wsrfm1ciydn3r3cgj3xr85qm9imj5a60922hwnz60i"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; }; + IONiseR = derive2 { name="IONiseR"; version="1.0.1"; sha256="0qfvrzc0ik868160zz7pwlcq1mycf9ax0mdx5gv2zvqmaxibjkiz"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; }; IPPD = derive2 { name="IPPD"; version="1.18.0"; sha256="1kl4rx6rdmpkm7bd2w8ncvz4sb8x6wljvxkif2l17yflsp1wjvp2"; depends=[bitops digest MASS Matrix XML]; }; - IRanges = derive2 { name="IRanges"; version="2.4.4"; sha256="0m1cm6xvslmi41vsccdkz8birq1q7h4h0paz5cra8104qpm55y9m"; depends=[BiocGenerics S4Vectors]; }; - ITALICS = derive2 { name="ITALICS"; version="2.30.0"; sha256="0bm38swbkqnf6nq17p49bh1lvpdvyz4vqv645awmfb5h7sfkhc3v"; depends=[affxparser DBI GLAD oligo oligoClasses]; }; + IRanges = derive2 { name="IRanges"; version="2.4.8"; sha256="0hi5k1j5jm4xrg1l506g279qw1xkvp1gg1zgsjzpbng4vx4k4iyl"; depends=[BiocGenerics S4Vectors]; }; + ITALICS = derive2 { name="ITALICS"; version="2.30.0"; sha256="0bm38swbkqnf6nq17p49bh1lvpdvyz4vqv645awmfb5h7sfkhc3v"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; IVAS = derive2 { name="IVAS"; version="1.2.0"; sha256="05sm8zhjqm3b966s9hc9dmsxajzry60wcz1qbxn989nly270cnqh"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; }; Icens = derive2 { name="Icens"; version="1.42.0"; sha256="14a2fsddq2vq7b5yaairxg2p3ivrfck1r91sc2izbiyvkqk5qjb4"; depends=[survival]; }; IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.14.0"; sha256="11rn1b6665b64h3a4mb8qkg5kp5l9ha6aa14f512k7lzs1vcczpm"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; }; - IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.18.0"; sha256="1jfhxxi3kavd9hjfdly36w634n46ni55i4lndfkqz6mp3h0rlb3s"; depends=[AffyCompatible biomaRt DAVIDQuery ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; + IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.18.2"; sha256="0wl2ybv23z84rlq2szk46kvcdm0bmqy0mjga9n33wz1c04br2bxj"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; IdeoViz = derive2 { name="IdeoViz"; version="1.4.0"; sha256="17rdvqim46q3lwm4c4k1xyayn8x76v9sj34x2xsr7day1r5kssq3"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; Imetagene = derive2 { name="Imetagene"; version="1.0.0"; sha256="1di9nx5ad0wd17byn740azx9yb6hd12dzvlfl8s5iyas4z9qzwya"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; }; - InPAS = derive2 { name="InPAS"; version="1.2.0"; sha256="0qplmjr9kldi62adn77a2pa8ml2h3dspp2j1sx1cjck7hvbahlc1"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; + InPAS = derive2 { name="InPAS"; version="1.2.1"; sha256="0vwzm9cf2zzc7pzw2xp7a7jpg9phzcskb6zm6jwx23p005pd8qv3"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.6.0"; sha256="1b7my9ri3kwi4rbdymcnwdjzv88pgdfjf2ax4gls0v4460hwg5az"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; }; KCsmart = derive2 { name="KCsmart"; version="2.28.0"; sha256="1bkc3ih97g0sr53wi4r0hdi6c46a7iabdsb7qy04mz7a8pa1g5ja"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; - KEGGREST = derive2 { name="KEGGREST"; version="1.10.0"; sha256="0w0a7fbdsf74db5abhlk8ns4279shrynxry1xsm7wbkivgc92r6r"; depends=[Biostrings httr png]; }; + KEGGREST = derive2 { name="KEGGREST"; version="1.10.1"; sha256="05mn2wp5xg5xpwm8wdpzv4xhcrv08qmyqi5i3ssa46nj4yn8zcc4"; depends=[Biostrings httr png]; }; KEGGgraph = derive2 { name="KEGGgraph"; version="1.28.0"; sha256="03lvm6qjalqwbi9i84b3glwf0kkagl3zh7cxhjd0jn7xzr20iw7q"; depends=[graph XML]; }; - KEGGprofile = derive2 { name="KEGGprofile"; version="1.12.0"; sha256="08yg0vn7d0yyamwj8s9bg9130y1dag34w5j9dhi00x7381jnrxwr"; depends=[AnnotationDbi biomaRt KEGGREST png TeachingDemos XML]; }; + KEGGprofile = derive2 { name="KEGGprofile"; version="1.12.0"; sha256="08yg0vn7d0yyamwj8s9bg9130y1dag34w5j9dhi00x7381jnrxwr"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; }; LBE = derive2 { name="LBE"; version="1.38.0"; sha256="0gsckpx2903pz55mjc8a3g3w4w3q58cly40mnjb82aqjc5vd8zzk"; depends=[]; }; LEA = derive2 { name="LEA"; version="1.2.0"; sha256="1mq5yhs9gq321ngrfqra3isfjp5isxz00f14ify4h7wjn2w5abnp"; depends=[]; }; LMGene = derive2 { name="LMGene"; version="2.26.0"; sha256="0mfs8kpirwkv8salg6aacy0hr0zwmmxr7pzh88sxj3x71k2dclzi"; depends=[affy Biobase multtest survival]; }; @@ -299,31 +299,31 @@ in with self; { LPEadj = derive2 { name="LPEadj"; version="1.30.0"; sha256="0ll9n3wkaink16laj2y98hb0kx5dglz776zlwdfkw54l1fjvvj5h"; depends=[LPE]; }; LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.20.0"; sha256="1q43harvk7q5wb8yjffhvzs4dxl8h5vp60ngym5vcvapxr8iym3w"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; }; LedPred = derive2 { name="LedPred"; version="1.2.0"; sha256="0zripgxpy0fr8d02k716frzbrrh1hdp85l7agk58yyhzw086b0bl"; depends=[akima e1071 GenomicRanges irr jsonlite plot3D plyr RCurl ROCR testthat]; }; - LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.24.0"; sha256="0h20asshxybng9apaqlvwfl30db7cwf2nqknwrd52rdh3b2x4025"; depends=[Biobase geepack]; }; - LowMACA = derive2 { name="LowMACA"; version="1.2.0"; sha256="12jm8psg7rnrsxydcqzfgiryy6lk5mxyximfzn7hnqqvxbs3wc55"; depends=[BiocParallel Biostrings cgdsr data_table motifStack RColorBrewer reshape2 stringr]; }; + LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.24.0"; sha256="0h20asshxybng9apaqlvwfl30db7cwf2nqknwrd52rdh3b2x4025"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; }; + LowMACA = derive2 { name="LowMACA"; version="1.2.0"; sha256="12jm8psg7rnrsxydcqzfgiryy6lk5mxyximfzn7hnqqvxbs3wc55"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; }; M3D = derive2 { name="M3D"; version="1.4.0"; sha256="088ghd9r5jr51179cj9hbk1dpj4f9fkrbgyghlq29w2bbgzc57xx"; depends=[BiSeq GenomicRanges IRanges]; }; MAIT = derive2 { name="MAIT"; version="1.4.0"; sha256="0yhslwqij9b073if2zp7f9w4fcxx02w9qjp2sj29g9gj1xfyij5b"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; }; MANOR = derive2 { name="MANOR"; version="1.42.0"; sha256="0k2mg4bchjaabbbxhnjgc0j3r10hngc1al06dp7077h1yqrcr9v2"; depends=[GLAD]; }; MBASED = derive2 { name="MBASED"; version="1.4.0"; sha256="0v56m2cdwq59drqxnpg3cg8cmwkq75wzrscyj7ajy1zp71m4kn4b"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; MBAmethyl = derive2 { name="MBAmethyl"; version="1.4.0"; sha256="0knn0fgrqmddwiyip49gchp5fzz77fb3fndhyddb0xw752nqvw8p"; depends=[]; }; MBCB = derive2 { name="MBCB"; version="1.24.0"; sha256="1qryzcjf3w138n12amch1zq2nl5nvagqqv422kcladapaq2lsgi2"; depends=[preprocessCore tcltk2]; }; - MCRestimate = derive2 { name="MCRestimate"; version="2.26.0"; sha256="1igfffsgz6m4rl2a5fnkb92r5x4qjr2yl8gaj3ws8478q3aq0bgd"; depends=[Biobase e1071 pamr randomForest RColorBrewer]; }; - MEAL = derive2 { name="MEAL"; version="1.0.1"; sha256="06jpn72bx2dzrpaixbp8i00wd1k6rqsxkzqhidyk9mkd507cgycs"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi S4Vectors scales SNPassoc snpStats sva vegan]; }; - MEDIPS = derive2 { name="MEDIPS"; version="1.20.0"; sha256="1p2lkms736idwq5wp79w2d0465yrkh2y7g97rcjffl60vhvjc8pm"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; + MCRestimate = derive2 { name="MCRestimate"; version="2.26.0"; sha256="1igfffsgz6m4rl2a5fnkb92r5x4qjr2yl8gaj3ws8478q3aq0bgd"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; }; + MEAL = derive2 { name="MEAL"; version="1.0.3"; sha256="1jrg6vw34hc8cg1ifyihrvya40x3f6ad77vp56wxdizr2wqp6h3q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi S4Vectors SNPassoc snpStats sva vegan]; }; + MEDIPS = derive2 { name="MEDIPS"; version="1.20.1"; sha256="0p5cg0nak7b6dr6l3j2abpm45dg644gbwl4w50ksqc1ahjksh3ir"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; MEDME = derive2 { name="MEDME"; version="1.30.0"; sha256="0j2zgd9lx3cbbv2vyqb4nd9rk3lxk33az50n8b9sn4cab7yws54x"; depends=[Biostrings drc MASS]; }; MEIGOR = derive2 { name="MEIGOR"; version="1.4.0"; sha256="1nywi9cndvkabiryrq72vxgrhz9d8jvzjvzhz9i4mx6g8xvphjng"; depends=[CNORode deSolve Rsolnp snowfall]; }; MGFM = derive2 { name="MGFM"; version="1.4.0"; sha256="1ffmz1cbk0bhswrjkjg1mg3cslmx2k2sxhhggv9s2wavx2s4q3ba"; depends=[annotate AnnotationDbi]; }; MIMOSA = derive2 { name="MIMOSA"; version="1.8.0"; sha256="1kc7qszpcxp82f56yxa7s1bcs5wblm4ywj5izgdf981qq16d6s2h"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; MLInterfaces = derive2 { name="MLInterfaces"; version="1.50.0"; sha256="16lf1hmjdmsh9r8qh9042k1rzvl8r39n71f2qs6ca79qcwpb9k6j"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rgl rpart sfsmisc shiny threejs]; }; MLP = derive2 { name="MLP"; version="1.18.0"; sha256="1g45rnj58bkp7n6paz7713ny0lc6v7lxigqsnvq4w460sg9k060d"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; - MLSeq = derive2 { name="MLSeq"; version="1.8.0"; sha256="1r7b4kjrkl70k6g286hxggkfmhgxadn9176fmd3nhin8ig0j3d48"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; + MLSeq = derive2 { name="MLSeq"; version="1.8.1"; sha256="0s324105s96jjasbbf9yri9bdkcwx8siwyg602fyrfkfh0888d3r"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; MMDiff = derive2 { name="MMDiff"; version="1.10.0"; sha256="0v000a87ciw83xj6p2443k1zs1w98ax38nzaf643wqmb8szwr6vf"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; }; MPFE = derive2 { name="MPFE"; version="1.6.0"; sha256="1n12bpb8jqddrcpdbbpfxzk4r44kg3p8bg8an5drzbv6rmyhdxwn"; depends=[]; }; MSGFgui = derive2 { name="MSGFgui"; version="1.4.0"; sha256="0pb9i81pqnz05jrwqh9myz5zchdn8ng5nrsv3cmdg4713yskqpcw"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; }; MSGFplus = derive2 { name="MSGFplus"; version="1.4.0"; sha256="1hw40kyhkxm0iy60n3y1cw2k52q5vjl47k4z5x34syq5d14iplva"; depends=[mzID]; }; MSnID = derive2 { name="MSnID"; version="1.4.0"; sha256="1my0kg8wi7f73sgy8brczkdxvjc2mslv3akk69bqw6j0lk1kaqir"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; }; - MSnbase = derive2 { name="MSnbase"; version="1.18.0"; sha256="0ksahjyx9wm91nisk2gzrh81jv5vy2q4wsyq436jyr8c3d058v8g"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; }; - MSstats = derive2 { name="MSstats"; version="3.2.0"; sha256="03pmigzxr38xxzga0ksh2kdhni46f5gqzs3r6p7gfcvi3b4fa4rk"; depends=[data_table ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape reshape2 survival]; }; + MSnbase = derive2 { name="MSnbase"; version="1.18.1"; sha256="09gv73ykvi6fcaxwclfmg99qbqwkxg8sn5b5nnwlyzin3g11fyq6"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; }; + MSstats = derive2 { name="MSstats"; version="3.2.1"; sha256="1zyxawn4zzfg6xdk2pawd5qdmfp9r98bvryb5qklbyqn0azakina"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape reshape2 survival]; }; MVCClass = derive2 { name="MVCClass"; version="1.44.0"; sha256="04mk9mp6kfjdbb1i9ivj1f2h5hm3nzhzznyc8w2vcihkf48gl89d"; depends=[]; }; MantelCorr = derive2 { name="MantelCorr"; version="1.40.0"; sha256="00603yxak0c7pif6acccvzkhp0jsw2n22l7awc2v0za25xjwn3mr"; depends=[]; }; MassArray = derive2 { name="MassArray"; version="1.22.0"; sha256="0z7na1ylvga5c42s0lh5shr1y316nla8rfd6wc9amkabsprfngqm"; depends=[]; }; @@ -333,30 +333,30 @@ in with self; { MeSHSim = derive2 { name="MeSHSim"; version="1.2.0"; sha256="1wgc2s1080sm2dn9ny4c1kpbcmbv4gv91h7jmgya9p8lk224aasr"; depends=[RCurl XML]; }; MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.42.0"; sha256="0x6jlza4ip0zscmmxlmy9w6r6cgpdawpxw00cvyrw4pswzhsaz03"; depends=[]; }; MergeMaid = derive2 { name="MergeMaid"; version="2.42.0"; sha256="1ajmrcpvzfjk0bkm2v3yklry91w5cxpjhgjr9hfszzldfhh5sfw4"; depends=[Biobase MASS survival]; }; - Metab = derive2 { name="Metab"; version="1.4.0"; sha256="1qppzp6czc6959ihjx0vq2qrz78vs2afckhyysa7lc7r14xijf51"; depends=[pander svDialogs xcms]; }; + Metab = derive2 { name="Metab"; version="1.4.1"; sha256="0wi45k7lx7f7y8bfpa4d1lggnkxlwwyjgzw22xyfw9yj40ma5x9g"; depends=[pander svDialogs xcms]; }; MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.2.0"; sha256="1pykrqvblmxwbxwyps3gn2vm6ch6cn9199g6a1fix2dwj26y66yf"; depends=[Biostrings gplots seqinr stringr]; }; - MethylAid = derive2 { name="MethylAid"; version="1.4.0"; sha256="0k8vl8ijgdvci8j1nkq7d4j4naxgsz5wdac5zk093zzjfrq2xmmg"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; }; + MethylAid = derive2 { name="MethylAid"; version="1.4.0"; sha256="0k8vl8ijgdvci8j1nkq7d4j4naxgsz5wdac5zk093zzjfrq2xmmg"; depends=[Biobase BiocGenerics BiocParallel FDb_InfiniumMethylation_hg19 ggplot2 gridBase hexbin IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; MethylMix = derive2 { name="MethylMix"; version="1.4.0"; sha256="17f32y50aywvyhfm60rr7dyjq3y56i4bysdzmin5plqlyq0gmx30"; depends=[doParallel foreach optimx RColorBrewer RPMM]; }; MethylSeekR = derive2 { name="MethylSeekR"; version="1.10.0"; sha256="0aa3p5qmprka7v6v3alhnag6qr853wvcib9vj0nj803saa34hil8"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; }; Mfuzz = derive2 { name="Mfuzz"; version="2.30.0"; sha256="02a3xrsd3nzr278zq8j7s9bq89v30v5yxcdmzcf480n1pqw66ayz"; depends=[Biobase e1071 tkWidgets]; }; MiChip = derive2 { name="MiChip"; version="1.24.0"; sha256="1jqhmrzi87g3fyfy0xbwcbkh5hhr9b1sa3lp9rxlxrijlxv35mb4"; depends=[Biobase]; }; MiPP = derive2 { name="MiPP"; version="1.42.0"; sha256="07flpzyr9jj50789ap78an6qygb3y9b87dkaami6aadpphp2ggn0"; depends=[Biobase e1071 MASS]; }; MiRaGE = derive2 { name="MiRaGE"; version="1.12.0"; sha256="0j8qip9sz4ifk7p6a41258lsw26i92qcrl72h4y43l2bln4r74ng"; depends=[AnnotationDbi Biobase BiocGenerics]; }; - MineICA = derive2 { name="MineICA"; version="1.10.0"; sha256="1vdnc25wbbsdx4z9c8x0asar6a50hzwvlkxrgn10dlm96jihmgdf"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; + MineICA = derive2 { name="MineICA"; version="1.10.0"; sha256="1vdnc25wbbsdx4z9c8x0asar6a50hzwvlkxrgn10dlm96jihmgdf"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; MinimumDistance = derive2 { name="MinimumDistance"; version="1.14.0"; sha256="0i3iag5a705q33vxqyb7pqpgmc8whpvy96yvidk2gyfh6lwqjsmn"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; Mirsynergy = derive2 { name="Mirsynergy"; version="1.6.0"; sha256="0wb257fi5wygky6iqaxdhp8n3pxzknv1vy44ay55y0bal1nbkzwa"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.20.0"; sha256="1salsb4askcv6xgzfwcwxkrr8qx7pjzqgljbw3ips2f4n6vqvyzj"; depends=[Biobase lattice limma statmod vsn xtable]; }; MoPS = derive2 { name="MoPS"; version="1.4.0"; sha256="07bylvhv1wnzj3z2ycw4rb29mlz34sbpksl0sdk47q9f5cjgvlnf"; depends=[Biobase]; }; MotIV = derive2 { name="MotIV"; version="1.26.0"; sha256="0s26dklw8kav8lz0245as7y9znj4yfiknpmcgrdmm62rq04c11mp"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; }; - MotifDb = derive2 { name="MotifDb"; version="1.12.0"; sha256="1pza9jsahkva0fiivkzn6vw3dgg1axl7vgd3hpim51a0r70g70v4"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; }; + MotifDb = derive2 { name="MotifDb"; version="1.12.1"; sha256="0n3kh8k0gbdc571bb45argxwsv6waaalgf9b6rzd3prnizkxzq4q"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; }; Mulcom = derive2 { name="Mulcom"; version="1.20.0"; sha256="0rf5haxfmf0zs42b9pinngbr4clnm0h707zplmig8dpaq5myski9"; depends=[Biobase fields]; }; MultiMed = derive2 { name="MultiMed"; version="1.4.0"; sha256="0vd8akfy23rx37b98z9g7x7hz0xjba912kvkwcd9m0k6fv4n2s5g"; depends=[]; }; NCIgraph = derive2 { name="NCIgraph"; version="1.18.0"; sha256="0ip8ds4jafb7nhfbz81gs9fl83a6b88di1z3nmkh31aqd4awrgim"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; }; NGScopy = derive2 { name="NGScopy"; version="1.4.0"; sha256="1vs7mi0lb8jcm9yc0jz7rvdnj95fr06cf1jkb9p84pnm9vpn63d6"; depends=[changepoint rbamtools Xmisc]; }; - NOISeq = derive2 { name="NOISeq"; version="2.14.0"; sha256="0n8f0qvvz16gj4n1ymqjwsia3f8kwbmzr5hzfqf31i1vmmaqndhb"; depends=[Biobase Matrix]; }; + NOISeq = derive2 { name="NOISeq"; version="2.14.1"; sha256="1z8ka9rbs6q267g3cjmgvdvp5ramk3dnlwry46wswifqihalhf9p"; depends=[Biobase Matrix]; }; NTW = derive2 { name="NTW"; version="1.20.0"; sha256="1p9hhjzh1mq907czbnjp7gg6n8ip4hzcq7x46bmmxpibi3wy64vp"; depends=[mvtnorm]; }; NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.0.0"; sha256="11mdy4ms3fvia04njjxj35p1kgbl3i2wzgplzl42yymm61xgcar2"; depends=[Biobase matrixStats]; }; - NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.2.0"; sha256="1cbja0bi4sw3n4f1wkgbvmwh1hr49hhrybqxc6a7f8lvq11s28rf"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; }; + NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.2.0"; sha256="1cbja0bi4sw3n4f1wkgbvmwh1hr49hhrybqxc6a7f8lvq11s28rf"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; }; NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.14.0"; sha256="08nhw2ira3amjs9zl134afjqwi0hniq0g3mgmljjp1l0277b8acg"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; }; NetPathMiner = derive2 { name="NetPathMiner"; version="1.6.0"; sha256="0rvar97f22n2afy185521wqh2scmzgw5fj2pv5dzydn0ybfnpn3j"; depends=[igraph]; }; NetSAM = derive2 { name="NetSAM"; version="1.10.0"; sha256="001jdmc1qb2gcwkfy98az66b52hcp0cqvjqp0yzj598523983v5i"; depends=[graph igraph seriation]; }; @@ -368,23 +368,23 @@ in with self; { OLINgui = derive2 { name="OLINgui"; version="1.44.0"; sha256="0477llp7g2bs7h4756qildpscllk5wdk303gkaaiv5ap6n8s8smj"; depends=[marray OLIN tkWidgets widgetTools]; }; OSAT = derive2 { name="OSAT"; version="1.18.0"; sha256="063jpwmhsnhi7al88mwcgbnd9azn2z3afxnjd2syf0mv156v86j0"; depends=[]; }; OTUbase = derive2 { name="OTUbase"; version="1.20.0"; sha256="0h9fgnc0saz8gsx6wgjigs4aiacbw03vzzxfc04wzfcdjgcm731p"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; - OmicCircos = derive2 { name="OmicCircos"; version="1.8.0"; sha256="0i33zqbjk18dyx39m74747q3b7xq0bkm2cjsfiwdjbp1xlf3s6qq"; depends=[GenomicRanges]; }; + OmicCircos = derive2 { name="OmicCircos"; version="1.8.1"; sha256="1xmf4wbij8lczj8jp1vj546gzv6210qcx30dpf4f3zqy083d583v"; depends=[GenomicRanges]; }; OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.2.0"; sha256="1r4qn2p5fxyi6r9l7zgbga1n5wcy18whcvyx0cwrr7lawbzjn6yg"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; OncoSimulR = derive2 { name="OncoSimulR"; version="2.0.0"; sha256="1q2kwszqf1ki8whchbx537sv6gah4ibclabhkgycd183rd0jv71r"; depends=[data_table graph gtools igraph Rcpp Rgraphviz]; }; - OperaMate = derive2 { name="OperaMate"; version="1.2.0"; sha256="1mwgnqk5xs2ha5r1qbr7daipi576vk2kpxdgid3xhhv63img1n93"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; }; + OperaMate = derive2 { name="OperaMate"; version="1.2.3"; sha256="1zgqf2ywazrxc66l2x8280izrzanan51b8vz5jwy8i7gnrm4gaa0"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; }; OrderedList = derive2 { name="OrderedList"; version="1.42.0"; sha256="0jk753xfyksv3vcgxd3z7nwh9cnjfdljzma4vc7kkdsblx5mpjyi"; depends=[Biobase twilight]; }; - OrganismDbi = derive2 { name="OrganismDbi"; version="1.12.0"; sha256="11s000prwar27aw8pyan3736gfj5qpwmhhhdp12k0m04f9fwsxy9"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; }; + OrganismDbi = derive2 { name="OrganismDbi"; version="1.12.1"; sha256="1rda35kjh3l5w5dz153x4p6adwm8apkljg5021a1rcs2x58q6z91"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; }; Oscope = derive2 { name="Oscope"; version="1.0.0"; sha256="08gyfjkimv8fj54kfnalpy1v72sv8vr0pjxyj52sb0hh0xcj2jqk"; depends=[BiocParallel cluster EBSeq testthat]; }; OutlierD = derive2 { name="OutlierD"; version="1.34.0"; sha256="19wrakxv833r5jqcrk627kgn6pissna9xdfnhn389a0j50xb02is"; depends=[Biobase quantreg]; }; - PAA = derive2 { name="PAA"; version="1.4.0"; sha256="0i6q99nmckd03j6wa3jn7bis4qg4gng492rm4b9v8112fvgwqb21"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; }; - PADOG = derive2 { name="PADOG"; version="1.12.0"; sha256="0qswjj0iskdinap0mdgh1vpsjx80hs5g1ikm7r3yrz3784577ji8"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; }; + PAA = derive2 { name="PAA"; version="1.4.1"; sha256="1g1yv95p9i58c4w3nsg490mn4c5qh4q4lfx1jj1ff7h3w7i6ds9d"; depends=[e1071 gplots limma MASS mRMRe randomForest Rcpp ROCR sva]; }; + PADOG = derive2 { name="PADOG"; version="1.12.0"; sha256="0qswjj0iskdinap0mdgh1vpsjx80hs5g1ikm7r3yrz3784577ji8"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; }; PANR = derive2 { name="PANR"; version="1.16.0"; sha256="19q7vxhq2kazjf3wxvzl0cvfyd49b00r0daf7vgzjv1smjq1czhq"; depends=[igraph MASS pvclust RedeR]; }; PAPi = derive2 { name="PAPi"; version="1.10.0"; sha256="0q90yi4s3jln713cpylgan7fzw7c536kw7bqlnkkaw6rjj1k6vvg"; depends=[KEGGREST svDialogs]; }; PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.34.0"; sha256="086hgqx9svn1pfzcz6affj2p9kvjk5k4viqkmwknlk9smw53l40l"; depends=[AnnotationDbi Biobase DBI RSQLite]; }; - PCpheno = derive2 { name="PCpheno"; version="1.32.0"; sha256="023dkbi3r1bs9wiihx3rcdc1dx5w21pfmk0n3n7zan4k5jkz4rwx"; depends=[annotate AnnotationDbi Biobase Category graph GSEABase ppiStats ScISI SLGI]; }; + PCpheno = derive2 { name="PCpheno"; version="1.32.0"; sha256="023dkbi3r1bs9wiihx3rcdc1dx5w21pfmk0n3n7zan4k5jkz4rwx"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; }; PECA = derive2 { name="PECA"; version="1.6.0"; sha256="00arj7ni6vdhsa3j9dvid997hqzw3kbznxgsfrjcda68gl28v8m0"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore]; }; PGA = derive2 { name="PGA"; version="1.0.0"; sha256="1s4ddjlnxh1waw1sm428lnaq655qfzlmabcjgdm95fi2cg66vs86"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer stringr VariantAnnotation]; }; - PGSEA = derive2 { name="PGSEA"; version="1.44.0"; sha256="0cfz479nlmbal4bs5ah12q6jpp7989xic59rml87i19bcbhz8z26"; depends=[annaffy AnnotationDbi Biobase]; }; + PGSEA = derive2 { name="PGSEA"; version="1.44.0"; sha256="0cfz479nlmbal4bs5ah12q6jpp7989xic59rml87i19bcbhz8z26"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; }; PICS = derive2 { name="PICS"; version="2.14.0"; sha256="01pc4nayj4iyrm18clb66f6f1a7y2w56l2z976xca86fhv6qgp4x"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; PING = derive2 { name="PING"; version="2.14.0"; sha256="0gpc9x9qn1m1rqdls54yfqlph84937fb3f5mf89yi6zcjh41yhlb"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; }; PLPE = derive2 { name="PLPE"; version="1.30.0"; sha256="0j6x0c7aigq5n2qwvn0bzcbzi8xqi9szbqfk58jr7ppgaxl1ljyw"; depends=[Biobase LPE MASS]; }; @@ -393,7 +393,7 @@ in with self; { PROPER = derive2 { name="PROPER"; version="1.2.0"; sha256="1xhq14wpd9j9g0zzb99mib46miciw6dhp4gvkpdvlfwhh3j8m8fb"; depends=[edgeR]; }; PROcess = derive2 { name="PROcess"; version="1.46.0"; sha256="0ysp2f2kx5p701ww81ip8n4617qs6rcjfrj62657j143ajz27py3"; depends=[Icens]; }; PSEA = derive2 { name="PSEA"; version="1.4.0"; sha256="1df2v472s2g4qcylvg9y5gahgjzq0m753j65736c8lc7g2zbpacp"; depends=[Biobase MASS]; }; - PSICQUIC = derive2 { name="PSICQUIC"; version="1.8.1"; sha256="04skvqlz9bii7qgq3zwwvsa490g6kq51q6hiddh9w18l1vhpvg2s"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; + PSICQUIC = derive2 { name="PSICQUIC"; version="1.8.3"; sha256="1g3xkbgr3by0gd8ngiavxyy14ixdhrwcf5ka329k3129d816425p"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; PWMEnrich = derive2 { name="PWMEnrich"; version="4.6.0"; sha256="0gvnky8k6v518g2a4lrvb5w7s1m3icckmlvyxcbvxdfyb5krdzh2"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; }; Path2PPI = derive2 { name="Path2PPI"; version="1.0.0"; sha256="15cf7r1aswc1agdkc7k8dbazscqnyrbfg68ms248gri3qrplkq0k"; depends=[igraph]; }; PathNet = derive2 { name="PathNet"; version="1.10.0"; sha256="07b6c8ry6a0ni8c88wccv69ksk5c6w3wwwp6cl3gcm7kv7r2qd00"; depends=[]; }; @@ -406,22 +406,22 @@ in with self; { ProtGenerics = derive2 { name="ProtGenerics"; version="1.2.1"; sha256="1hrds64ijygmilig3l99aj5cqqp8cr74x1jfs5qfw9xkma0ggz3r"; depends=[BiocGenerics]; }; ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.0.0"; sha256="1ss1kamy3djmxvr838bkh6jd93br8hql9a3aanqml7fzz3pvdq1p"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR]; }; Pviz = derive2 { name="Pviz"; version="1.4.0"; sha256="02p4l8svrmh0jh1xlgngbdc0h96m2jw15x1ld05p23acj44sacgh"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; - QDNAseq = derive2 { name="QDNAseq"; version="1.6.0"; sha256="124xvr15phhkvj8i16bmcrdb40gca63l8qvdp60m6xgsln0bq37j"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; }; + QDNAseq = derive2 { name="QDNAseq"; version="1.6.1"; sha256="1jbnmvf3i4kimk7s558sbvkb0l6gb8hsbfvxdw93sfk4dwsi5c12"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; }; QUALIFIER = derive2 { name="QUALIFIER"; version="1.14.1"; sha256="1h87y2q8x4ri6sv7nbppzpqa96m99mijq1739h8cfab5wmi0bcl5"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; }; QuartPAC = derive2 { name="QuartPAC"; version="1.2.0"; sha256="0nx3a9jsp2rq61jszm6kgpbqi9m5jkqfvk94npp7nk3qwhfi00j8"; depends=[data_table GraphPAC iPAC SpacePAC]; }; - QuasR = derive2 { name="QuasR"; version="1.10.0"; sha256="1hj7f0yw2y8b601ni9va3r0idj0m13dcwcrq6a4vw59piiiaymg2"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; }; + QuasR = derive2 { name="QuasR"; version="1.10.1"; sha256="1sdk1kh8365bp8w8xl06lhqdw0kprqj4gvwhw46lyiw1r3xapqd5"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; }; R3CPET = derive2 { name="R3CPET"; version="1.2.0"; sha256="10ps9l6cc61m32a5b0b0y51sf8ci8drrpk02781p3i23jyamx8gz"; depends=[clues clValid data_table GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.20.0"; sha256="118gdmlqgy6nn55vq7nvyqvlwbg2vca7fkw0gjvb63ymv8lhfm7p"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; RBGL = derive2 { name="RBGL"; version="1.46.0"; sha256="1zl2cvzhrm01hkqvzqrf37bnh0snm49594lk6ydiafn3s31rhk6f"; depends=[graph]; }; RBM = derive2 { name="RBM"; version="1.2.0"; sha256="148is7ddwj8siik6a6svghnyl3ix8yf6ywnp90fxb8x0c5yknvmm"; depends=[limma marray]; }; RBioinf = derive2 { name="RBioinf"; version="1.30.0"; sha256="038xqmbsajkcj5s0pjv0jb9lizq555kxabxjj3pgipjbqfjbj0xg"; depends=[graph]; }; RCASPAR = derive2 { name="RCASPAR"; version="1.16.0"; sha256="0rliirdsd89lzr4ych9r7x90d4nzz1p036cmj8k01lzs6nvckh05"; depends=[]; }; - RCy3 = derive2 { name="RCy3"; version="0.99.25"; sha256="04v42r1fyc4gvsp494mpxmaigifwy9hww0fbdwrdwmic0d6yhx8d"; depends=[graph httr RCurl RJSONIO]; }; - RCyjs = derive2 { name="RCyjs"; version="1.2.0"; sha256="03mhn25jf8sd6094w8kc7n5fxga4gr4glxpniy5n93z8g608rpk5"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; - RCytoscape = derive2 { name="RCytoscape"; version="1.20.0"; sha256="0rkxavgh509wvkqv64s651px1jr3rcb06nyyhq96m360rh5fw73g"; depends=[BiocGenerics graph]; }; - RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.8.0"; sha256="1f92a80zksp90wlj2iymdf20hqkbp1aw7mdb7w5r19zckskcrg1m"; depends=[Category ggplot2 GOstats graph RBGL rJava]; }; + RCy3 = derive2 { name="RCy3"; version="1.0.1"; sha256="0bqn2k7k1007ih48inmdjnl0pan2q86p9p4c8hkbgv6r2alxc0d1"; depends=[graph httr RCurl RJSONIO]; }; + RCyjs = derive2 { name="RCyjs"; version="1.2.3"; sha256="1z3a80j9wcr2jsv35chqqqc95dcjsmz48hylvc432p2jwy572phn"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; + RCytoscape = derive2 { name="RCytoscape"; version="1.20.1"; sha256="1ymbj8xlny9bsbcxyvg9si7v2rlc7bw3sq0424bsfc92l3as0rjj"; depends=[BiocGenerics graph]; }; + RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.8.0"; sha256="1f92a80zksp90wlj2iymdf20hqkbp1aw7mdb7w5r19zckskcrg1m"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; }; RDRToolbox = derive2 { name="RDRToolbox"; version="1.20.0"; sha256="1an5sz2lcq9n0h0i8s6g9jqaskbi7drwib8a1zwlpim1f399h45d"; depends=[MASS rgl]; }; - REDseq = derive2 { name="REDseq"; version="1.16.0"; sha256="13lglqabk3ij37i469s40gagb57z7mqcmdwahvf60rrgxvhbxkwz"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome ChIPpeakAnno IRanges multtest]; }; + REDseq = derive2 { name="REDseq"; version="1.16.0"; sha256="13lglqabk3ij37i469s40gagb57z7mqcmdwahvf60rrgxvhbxkwz"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; }; RGSEA = derive2 { name="RGSEA"; version="1.4.0"; sha256="1dqw1vppxsr14sr94sz4ca2vacky70r0ingkq8cghsbvwp73i6vp"; depends=[BiocGenerics]; }; RGalaxy = derive2 { name="RGalaxy"; version="1.14.0"; sha256="1g63kmfywmnjammifjkqiy8cnqvb77d2x4yff8bgz2ib60gyqm14"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; }; RIPSeeker = derive2 { name="RIPSeeker"; version="1.10.0"; sha256="09pr25pf488vdim3k6mvbvqqyxhl2dfs4y699x8xyhym34c74xcj"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer SummarizedExperiment]; }; @@ -429,7 +429,7 @@ in with self; { RMassBank = derive2 { name="RMassBank"; version="1.12.0"; sha256="1rsvdai5fhkx9pgj14mm2x1xr4h8l0ppakxp8j3aicih92cvdd55"; depends=[mzR rcdk Rcpp RCurl rjson XML yaml]; }; RNASeqPower = derive2 { name="RNASeqPower"; version="1.10.0"; sha256="16nhhmww8awf5rp6j8hrmz9riw4gppmvd4a2vlp57sr6y82krlsz"; depends=[]; }; RNAinteract = derive2 { name="RNAinteract"; version="1.18.0"; sha256="0v7hz20nsc2dkb4xjzdhib2rj8k9zkn2c71rhg46b6hy3jxrm7m1"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; - RNAither = derive2 { name="RNAither"; version="2.18.0"; sha256="1h2aqhpc455hhwbviv3mk55jcj62xy7fyaca26ryxi1ymksajvcb"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; + RNAither = derive2 { name="RNAither"; version="2.18.4"; sha256="15kr629g5l6isa4069fibgdh9j5zkmjll5anpigfbmdb85dhwlbc"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; RNAprobR = derive2 { name="RNAprobR"; version="1.2.0"; sha256="017sc7ba5kw55rc74acv3i5i0mg7h5hblaqxy4j2ln6iqm1h38fi"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; }; ROC = derive2 { name="ROC"; version="1.46.0"; sha256="15m52d3z10nrzh7slc6b7js1dybh0dg4pd6nnjbjkc2m5axra09g"; depends=[]; }; ROntoTools = derive2 { name="ROntoTools"; version="1.10.0"; sha256="0bsab4glgazf3x2rg96shks4vqkarqpls71699q7v7zaw7ay7hra"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; @@ -437,18 +437,18 @@ in with self; { RRHO = derive2 { name="RRHO"; version="1.10.0"; sha256="11iarlljr6lrq6nf36pdxf7p54mk6xwsz8ssfsg8zmpcpvb8adgc"; depends=[VennDiagram]; }; RSVSim = derive2 { name="RSVSim"; version="1.10.0"; sha256="1ipzsgm7p2xf8v3asc6gcwvl6gnrn8nkg45iyl948kgys9izrng3"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; RTCA = derive2 { name="RTCA"; version="1.22.0"; sha256="1rwgrac92n7ghk417sj3p80ahlnn8c9nq8af999a825bjbi90qd5"; depends=[Biobase gtools RColorBrewer]; }; - RTCGA = derive2 { name="RTCGA"; version="1.0.0"; sha256="0di67arcr1r3wqx9spf53vrs74r759hww5rdn2m5ka1apnpdf5mw"; depends=[assertthat data_table knitr magrittr rvest stringi XML xml2]; }; + RTCGA = derive2 { name="RTCGA"; version="1.0.2"; sha256="14lxdzrii9xvpjvflqim2kasx2xd5pk9rijpad2pkm8yq5cs662p"; depends=[assertthat data_table knitr magrittr rvest stringi XML xml2]; }; RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.0.0"; sha256="0bwdh52qsl2bawr8s4q92mrx1wn4yyc4qbag97w469ixlsr7fcx2"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; }; - RTN = derive2 { name="RTN"; version="1.8.2"; sha256="05gdm8f3q06f474svf9p7yydr6a7191fwsaa1igvklnhqfi0j5iy"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; }; + RTN = derive2 { name="RTN"; version="1.8.4"; sha256="17znp5k4jrxnl3iq5mlljkjzm5lhi5a5pw06gkd081zs6bwhi9v3"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; }; RTopper = derive2 { name="RTopper"; version="1.16.0"; sha256="0ikhlz9fa21ij9ikira4grc6fahjd8n2fwsdgkxr058zlzyw0c7b"; depends=[Biobase limma multtest]; }; RUVSeq = derive2 { name="RUVSeq"; version="1.4.0"; sha256="0xqma406k3sd47r830jc00al2xmx3wmfg5q0zk3b29bxiklj5w4f"; depends=[Biobase EDASeq edgeR MASS]; }; - RUVcorr = derive2 { name="RUVcorr"; version="1.2.0"; sha256="1iaja7xcmih63vp9g4km8yx2rrafkybp3azrxw5i28sv1hl7187j"; depends=[BiocParallel corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; - RUVnormalize = derive2 { name="RUVnormalize"; version="1.4.0"; sha256="0774hzk89i0hnhfw6h0ligsl406jrrxk80ibv85k6vyq31s2i9xv"; depends=[Biobase]; }; + RUVcorr = derive2 { name="RUVcorr"; version="1.2.0"; sha256="1iaja7xcmih63vp9g4km8yx2rrafkybp3azrxw5i28sv1hl7187j"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; + RUVnormalize = derive2 { name="RUVnormalize"; version="1.4.1"; sha256="13ksgz1givgy3ws97xa1x8v96ikpia5s9675l3xkz1fzsm3wmbzi"; depends=[Biobase RUVnormalizeData]; }; RWebServices = derive2 { name="RWebServices"; version="1.34.0"; sha256="05czankzfvgsfrs2am8dkglzcix22s7gc4bgci0a66x8z31dlkx0"; depends=[RCurl SJava TypeInfo]; }; RamiGO = derive2 { name="RamiGO"; version="1.16.0"; sha256="12mwfcljw323aqpzc4z5hl2h5qy51bpi5z59x4hx8inw3vc3n55y"; depends=[graph gsubfn igraph png RCurl RCytoscape]; }; RankProd = derive2 { name="RankProd"; version="2.42.0"; sha256="0ma0mmj335v04bx96wssas81hx9apv6gv9y54cgac4n6v1ci9a9y"; depends=[]; }; RareVariantVis = derive2 { name="RareVariantVis"; version="1.2.0"; sha256="1azfhbb9hpahpglwal4qd8c91zkjhda42ljn2jjd8ylvl4mgzv96"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; }; - Rariant = derive2 { name="Rariant"; version="1.6.0"; sha256="1h7bkbd8230jvicnx2my9kmnwkjfvr4574w00y7m64r7qm73pv3l"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; }; + Rariant = derive2 { name="Rariant"; version="1.6.1"; sha256="00q303w8gmp7p8s0k10l6w524d1yjjxhwckgg7g34hgvak75dqdg"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; }; RbcBook1 = derive2 { name="RbcBook1"; version="1.38.0"; sha256="1pg6bg2q9whz4g0483ll3l71w7jiy68xd8l71vgr8zy0nip1kmg1"; depends=[Biobase graph rpart]; }; Rbowtie = derive2 { name="Rbowtie"; version="1.10.0"; sha256="1pdkircilkk9cnb556jmmany1c1xjg29blrs0knribzn6h6bm76s"; depends=[]; }; Rcade = derive2 { name="Rcade"; version="1.12.0"; sha256="08q62agkyb810b0hfvs9vb9rh0ls8zrz83558xprijjizrkg9cg2"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; }; @@ -457,50 +457,50 @@ in with self; { Rcpi = derive2 { name="Rcpi"; version="1.6.0"; sha256="19h9zxkb4zw9c46fvd0yn7bzy03a73glc4yyla0fzrngk1vs2s5q"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; }; Rdisop = derive2 { name="Rdisop"; version="1.30.0"; sha256="0v9dm982y2f6gd4lxr2c123a4ijsa8sbn6mkcchwlli8hbxxvpcf"; depends=[Rcpp RcppClassic]; }; ReQON = derive2 { name="ReQON"; version="1.16.0"; sha256="1j79vmhk34argysbjyxcsmfjsplkxq4cn8gprm6min1v08xzryg0"; depends=[rJava Rsamtools seqbias]; }; - ReactomePA = derive2 { name="ReactomePA"; version="1.14.2"; sha256="0lk0cp4jdi2b8lyr2yqbc61zw62998m6zif7v52yxc7mbhasbhff"; depends=[AnnotationDbi DOSE graphite igraph]; }; + ReactomePA = derive2 { name="ReactomePA"; version="1.14.4"; sha256="1dywrigxh29i50k607fi4p33dxjw2dlm5q86i0400l99lp0xj0di"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; }; ReadqPCR = derive2 { name="ReadqPCR"; version="1.16.0"; sha256="04d3gam21cia44w7wz1ai8a60igsbjslac25rb7z5i9ijbx8jk9q"; depends=[affy Biobase]; }; - RedeR = derive2 { name="RedeR"; version="1.18.0"; sha256="18vz0gn66fxfbba4q01fnw5flnqv5xlsa79csgxg4xfqyjnnvyhq"; depends=[igraph RCurl XML]; }; - RefNet = derive2 { name="RefNet"; version="1.6.0"; sha256="1w5zad7s900chkxc1d92qifrh2xh3g2jihafswh4y5v8bavi6qjb"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; }; + RedeR = derive2 { name="RedeR"; version="1.18.1"; sha256="0arhg8zav0h3ivinnyl6b4z85b4l3w9vlzxiixnwzdmnr2ch78dc"; depends=[igraph pvclust RCurl XML]; }; + RefNet = derive2 { name="RefNet"; version="1.6.1"; sha256="0l0krjjk1jld7z5zy6k3z6m2qkqd86yj92xfck75q3bq3jm96h0j"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; }; RefPlus = derive2 { name="RefPlus"; version="1.40.0"; sha256="13qlm4smaafx1x78wn959wc1rm4wns7l6qgdmh1lg5khkrrh3x19"; depends=[affy affyPLM Biobase preprocessCore]; }; Repitools = derive2 { name="Repitools"; version="1.16.0"; sha256="1jsimbrnfzvdydb4s6zvimj58gpxyydyngq2dflacg1gd7msq66a"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; }; - ReportingTools = derive2 { name="ReportingTools"; version="2.10.0"; sha256="1zlxr7z7c3vlkbmpcmw88a9caaf1gwhh8jv31fg2njy60vysb0m0"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma R_utils XML]; }; + ReportingTools = derive2 { name="ReportingTools"; version="2.10.0"; sha256="1zlxr7z7c3vlkbmpcmw88a9caaf1gwhh8jv31fg2njy60vysb0m0"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; Rgraphviz = derive2 { name="Rgraphviz"; version="2.14.0"; sha256="0lwg57kja3r7ij1d3yp5g3r0zbzn2nannlvsh029sd626yfp6fb6"; depends=[graph]; }; Rhtslib = derive2 { name="Rhtslib"; version="1.2.1"; sha256="0x7x8sbzjxssnnfa43kh38nlkqz6qvj41xdbgniyp7b6kyyr0na4"; depends=[zlibbioc]; }; - RiboProfiling = derive2 { name="RiboProfiling"; version="1.0.0"; sha256="1kn4w7gn6b15p9jimzn6hl3npfacqyc6wz26mv17cd00bxypzbn3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors]; }; + RiboProfiling = derive2 { name="RiboProfiling"; version="1.0.3"; sha256="096lpmrdwbsw71k4qdx9d0zgs83r0ixphkg60p40vgvpmhq1c3dh"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors]; }; Ringo = derive2 { name="Ringo"; version="1.34.0"; sha256="0r549n840sq9whaz8nk7rz3wardxc8jvwdni4bd5f7zzrhj0ynhl"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; Risa = derive2 { name="Risa"; version="1.12.0"; sha256="0s23fbdk1v1cg0c67vhkz53wava1swjig8fz8jsv8av0pqb0rg17"; depends=[affy Biobase biocViews Rcpp xcms]; }; Rmagpie = derive2 { name="Rmagpie"; version="1.26.0"; sha256="1iwiy8d5cvrmk6jgwaplx980gzdgxp9k53zjwmzya8bar7386sgs"; depends=[Biobase e1071 kernlab pamr]; }; - RmiR = derive2 { name="RmiR"; version="1.26.0"; sha256="1nnpr5jp5anbqbgyg53qqjhi49bibymc0l3yj6ar5d6csavrympb"; depends=[DBI RSVGTipsDevice]; }; - RnBeads = derive2 { name="RnBeads"; version="1.2.0"; sha256="1yshsdkzk8br1qvr76m699jpzhvxnflwvgbbag5hm1h3mh35zacz"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; }; - RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.2.0"; sha256="11zkq3i8pn9qfs8qynnrlfmr9fdnmqayqmgxzw54fzpj62b0y894"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp]; }; + RmiR = derive2 { name="RmiR"; version="1.26.0"; sha256="1nnpr5jp5anbqbgyg53qqjhi49bibymc0l3yj6ar5d6csavrympb"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; }; + RnBeads = derive2 { name="RnBeads"; version="1.2.2"; sha256="1nn64lqnzvvlms8m0i3rn5mrp12xxjra8wssabbbnbdg60a1g7i1"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; }; + RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.2.0"; sha256="11zkq3i8pn9qfs8qynnrlfmr9fdnmqayqmgxzw54fzpj62b0y894"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; Rnits = derive2 { name="Rnits"; version="1.4.0"; sha256="0igqimvync5sz1hsn3m9ijivw1vxi8vjpsdcjzf9dkyqhkand6r3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; Roleswitch = derive2 { name="Roleswitch"; version="1.8.0"; sha256="0libkpp9scrbakhzp030bx86f4np6ijn01r8xzn02f5106h23gz7"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; }; Rolexa = derive2 { name="Rolexa"; version="1.26.0"; sha256="184v27zycmqnj4fpjgrxl3vcxxfxwkbfqdzm6wsyxixm93rmz7v4"; depends=[Biostrings IRanges mclust ShortRead]; }; RpsiXML = derive2 { name="RpsiXML"; version="2.12.0"; sha256="0zlcr1f5sf98bwxakbmq33kniwlpxcc32z5fz7vqsasyv5vbz1ks"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; - Rqc = derive2 { name="Rqc"; version="1.4.0"; sha256="0pj3hxmqz35lf5wjzjjzrm0l3g3b48cxh2f9s0642mar3vz3vlbp"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; + Rqc = derive2 { name="Rqc"; version="1.4.2"; sha256="0kmp69c2hinfh5bn8ka5rsd4fl14gh4xjj24gw5kasjfbhy5l90x"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; Rsamtools = derive2 { name="Rsamtools"; version="1.22.0"; sha256="1yc3nzzms3igjwr4l9yd3wdac95glcs08b4cfp7disyly0wcskjd"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; }; - Rsubread = derive2 { name="Rsubread"; version="1.20.2"; sha256="176zfmhhfg98ls7qcrjqbwbrvlc2zyykq1nj1yf4j8b6rh26jdg2"; depends=[]; }; + Rsubread = derive2 { name="Rsubread"; version="1.20.3"; sha256="0i0dns4392cflajx58x3wy8m6fbh4pb6vyiliisws1cxdq3yilk4"; depends=[]; }; Rtreemix = derive2 { name="Rtreemix"; version="1.32.0"; sha256="0snj644rc6cyjcswckz88fihd6ynjq3sj7qf733vbvqj8d12dqk8"; depends=[Biobase graph Hmisc]; }; - S4Vectors = derive2 { name="S4Vectors"; version="0.8.3"; sha256="0lqd31sk1ydzs1x26r5cm3izh35nvfp38x9189pdxl1q0dpb8ji3"; depends=[BiocGenerics]; }; + S4Vectors = derive2 { name="S4Vectors"; version="0.8.11"; sha256="12iibcs63m9iy7f45wgjcqsna2dnqwckphk682389grshz0g4x66"; depends=[BiocGenerics]; }; SAGx = derive2 { name="SAGx"; version="1.44.0"; sha256="0rrw1y80ybpskwvcdbyqq8m4d17sz07bv9gpa27rvfq2sy4znsk6"; depends=[Biobase multtest]; }; SANTA = derive2 { name="SANTA"; version="2.8.0"; sha256="1dlc6m8lq9cyvxqrp0gnrfx1ksfl5p2hvgl5n67sag3z40vdhflc"; depends=[igraph Matrix snow]; }; SBMLR = derive2 { name="SBMLR"; version="1.66.0"; sha256="0xa9s382nd8gpkx2lp02iarjqqs2w4qp6xzg9sy654yg4iyjmnms"; depends=[deSolve XML]; }; - SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.12.0"; sha256="0z96xbdz9k5n0q8hj028qp39lhy615yz1d978ydq83fkah07kjni"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; + SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.12.1"; sha256="0z5qp738xwwnsiv5bygfyljxld0vw805xl3plh5wrwy9gsxn2c7v"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; SELEX = derive2 { name="SELEX"; version="1.2.0"; sha256="019142j9x7p38mi3wvzxm138s9cmq8ljkb5i5lk5pj1z8cc3ci0d"; depends=[Biostrings rJava]; }; - SEPA = derive2 { name="SEPA"; version="1.0.0"; sha256="1hvkz3pyp8qkq1mjw9wl426db6n3ay05bx2djkdpvpbai4fjwgvc"; depends=[ggplot2 reshape2 segmented shiny topGO]; }; - SGSeq = derive2 { name="SGSeq"; version="1.4.0"; sha256="0p46w407slmmis5kmla0cdh7910a9gfish44acpix8d5bsz06xjc"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; + SEPA = derive2 { name="SEPA"; version="1.0.0"; sha256="1hvkz3pyp8qkq1mjw9wl426db6n3ay05bx2djkdpvpbai4fjwgvc"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; }; + SGSeq = derive2 { name="SGSeq"; version="1.4.3"; sha256="09x0mw1xil0p3742w031ljrh5ywr1axsakw7j6300v98j87l2ymv"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; }; SICtools = derive2 { name="SICtools"; version="1.0.0"; sha256="16yzykl4s1b2nkgarxsrgvk6cvjdfla3x3ijjn1yxj22wjdzfg9m"; depends=[Biostrings doMC foreach GenomicRanges IRanges matrixStats Rsamtools stringr]; }; SIM = derive2 { name="SIM"; version="1.40.0"; sha256="02v2fi0yw1sxj5f41h7lihs96y9crca2srwflpdjif8sx6pk6yvq"; depends=[globaltest quantreg quantsmooth]; }; SIMAT = derive2 { name="SIMAT"; version="1.2.0"; sha256="1qwird1yqwdh7085d4k7zgy1ld0c6215ks6i3d3d71pwg22agiw4"; depends=[ggplot2 mzR Rcpp reshape2]; }; SISPA = derive2 { name="SISPA"; version="1.0.0"; sha256="01kf83hlc7qyyxr4dx86m9vc16cydrkw4sajs2ikpn2fnrqkx6z1"; depends=[changepoint data_table ggplot2 GSVA plyr]; }; SJava = derive2 { name="SJava"; version="0.96.0"; sha256="17qvrd8n0vrn9fn9p31s2bhzf6064hnf89c54hbx3flzki73waaz"; depends=[]; }; - SLGI = derive2 { name="SLGI"; version="1.30.0"; sha256="1pardqmvmi4877q09n3379wq57pyqla53s8gxvygrqny2drb5crj"; depends=[AnnotationDbi Biobase BiocGenerics lattice ScISI]; }; + SLGI = derive2 { name="SLGI"; version="1.30.0"; sha256="1pardqmvmi4877q09n3379wq57pyqla53s8gxvygrqny2drb5crj"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; SLqPCR = derive2 { name="SLqPCR"; version="1.36.0"; sha256="02i77a1rrz46sgrji57nm92d6w50wcwdagxa6y2a6rdcjcv2g66n"; depends=[]; }; SMAP = derive2 { name="SMAP"; version="1.34.0"; sha256="07mdnmirsbz8m5zky169q2mqdn1sdh1nlx8qsgdf8h0n0vcs2h3z"; depends=[]; }; - SNAGEE = derive2 { name="SNAGEE"; version="1.10.0"; sha256="187xcsdpbjdiabzjg3gggnz1rcwgjzj4279i26h879ijs7hli19w"; depends=[]; }; - SNPRelate = derive2 { name="SNPRelate"; version="1.4.0"; sha256="1q21cddmfcj32665m8n6axrmr40hdwb5vqfa2z4pcdhzg6ii0jj2"; depends=[gdsfmt]; }; + SNAGEE = derive2 { name="SNAGEE"; version="1.10.0"; sha256="187xcsdpbjdiabzjg3gggnz1rcwgjzj4279i26h879ijs7hli19w"; depends=[SNAGEEdata]; }; + SNPRelate = derive2 { name="SNPRelate"; version="1.4.2"; sha256="0iy4y58bhkr6ig1n2arw7pra29fsrxp10kzf9a479jrn3jdxxb0q"; depends=[gdsfmt]; }; SNPchip = derive2 { name="SNPchip"; version="2.16.0"; sha256="1fxskvkzn0mfcg2zjs2r2fr0pifrha54a15vbxxcawy4pggf7fdv"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; }; - SNPhood = derive2 { name="SNPhood"; version="1.0.1"; sha256="1vlyzh8qcp2pr4d97zdivh25xmzqwdaw8m1fjlidijfj8xbgg01d"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools VariantAnnotation]; }; + SNPhood = derive2 { name="SNPhood"; version="1.0.7"; sha256="1kr86xm2w6pmwbglhl97qpxyzsyqzrkzkjav6dm0zqn24f1q9579"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools VariantAnnotation]; }; SPEM = derive2 { name="SPEM"; version="1.10.0"; sha256="1b6r9x5q06ai6fh99a0qcx3lnjdqip7vhy32i38s16ixw9g94rcf"; depends=[Biobase Rsolnp]; }; SPIA = derive2 { name="SPIA"; version="2.22.0"; sha256="0103aapq3p6il4acaa9fna1a5iri3fb656r60xg6ljyywcgy55yl"; depends=[KEGGgraph]; }; SQUADD = derive2 { name="SQUADD"; version="1.20.0"; sha256="1nxf68waqnm9jaj0r8z1499kw5c6l1sykj38wikcc39bsyy23kxm"; depends=[RColorBrewer]; }; @@ -508,17 +508,17 @@ in with self; { SSPA = derive2 { name="SSPA"; version="2.10.0"; sha256="1835g6chjrl1kz5zc710jy0lx04b84khk2kx981ga6rmlihn5xyc"; depends=[lattice limma qvalue]; }; STAN = derive2 { name="STAN"; version="1.4.0"; sha256="0phrznzv3n9nvjbxb172ywxcc6dfjz2gw21w4nzxiwcjaf3kg841"; depends=[Rsolnp]; }; STATegRa = derive2 { name="STATegRa"; version="1.4.0"; sha256="1nw4r8h8gv8y8a6qhh8gnsdc7pyp3h762ayhgkjy844kmxn316ad"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; - STRINGdb = derive2 { name="STRINGdb"; version="1.10.0"; sha256="06ddw546hr28s9ajwmrf1fr7w1h7crn18as7vnn4cllvr1d5axff"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; - SVM2CRM = derive2 { name="SVM2CRM"; version="1.2.0"; sha256="06jhyvq3j35skvkf57iqfphypsv43k12i0wybhhvx4wjsdrrhmwq"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash verification zoo]; }; - SWATH2stats = derive2 { name="SWATH2stats"; version="1.0.2"; sha256="1rf5jvsa94cfdg6790zixkdp973ydf90l1y0igqyp1h94x9sx3v4"; depends=[data_table reshape2]; }; + STRINGdb = derive2 { name="STRINGdb"; version="1.10.1"; sha256="0wj8rrm7syvgisv6cn7zh81fpg33qbyzacv69d96wdwp8jsspdh2"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; + SVM2CRM = derive2 { name="SVM2CRM"; version="1.2.0"; sha256="06jhyvq3j35skvkf57iqfphypsv43k12i0wybhhvx4wjsdrrhmwq"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; }; + SWATH2stats = derive2 { name="SWATH2stats"; version="1.0.3"; sha256="03p18b0kz33g7jldynxsk561xrrl547m3w7cb2gq766k56fv93m6"; depends=[data_table reshape2]; }; SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.24.0"; sha256="1bpaz8vzk3iysbcsdky2vcwvkc38m66b4bh1jnxgh6ld318pkllz"; depends=[]; }; - ScISI = derive2 { name="ScISI"; version="1.42.0"; sha256="0bmpl2zaalwxhhc9vj9v3x8ig6hbj4lrbfl2dxmivgsh1hqvbcli"; depends=[annotate AnnotationDbi apComplex RpsiXML]; }; - SemDist = derive2 { name="SemDist"; version="1.4.0"; sha256="13wazcicjss3ybj20n958qjxk34aylpza4nggk0np8bjs5460i6j"; depends=[annotate AnnotationDbi]; }; + ScISI = derive2 { name="ScISI"; version="1.42.0"; sha256="0bmpl2zaalwxhhc9vj9v3x8ig6hbj4lrbfl2dxmivgsh1hqvbcli"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; }; + SemDist = derive2 { name="SemDist"; version="1.4.0"; sha256="13wazcicjss3ybj20n958qjxk34aylpza4nggk0np8bjs5460i6j"; depends=[annotate AnnotationDbi GO_db]; }; SeqArray = derive2 { name="SeqArray"; version="1.10.6"; sha256="1x9zf02h1x1sqypf5663hjl6xvq8d0q4h6ls1ndagkaqkrwqhgyd"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; SeqGSEA = derive2 { name="SeqGSEA"; version="1.10.0"; sha256="02jbxncy2y2p7xg33xpv4hwcd8344qsfy3ibb9d4c8kf9b5wj9f1"; depends=[Biobase biomaRt DESeq doParallel]; }; SeqVarTools = derive2 { name="SeqVarTools"; version="1.8.1"; sha256="1sgkcqhqhrxzipwcwn5kvhsns08dh1fdpd8xzhmzylsr5yb9cbsy"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray stringr VariantAnnotation]; }; ShortRead = derive2 { name="ShortRead"; version="1.28.0"; sha256="00awzvdpd21shixcx03mjqz8bqww2z96ffkna2gpqh3f7d2pmhii"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; }; - SigCheck = derive2 { name="SigCheck"; version="2.2.0"; sha256="1hp7rspjakdrlzmkppad6pqj8by40ccwyzrypjzl4c2144mayz0s"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; + SigCheck = derive2 { name="SigCheck"; version="2.2.1"; sha256="001i9izz5g9p8ymxicx884gsqc53jq6pck4al3s2i0y0mhv9dw8m"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; SigFuge = derive2 { name="SigFuge"; version="1.8.0"; sha256="1bs55pc5z3x22708pdr551rxvq66i2xyi9l9j1i6vnl7h1433iy3"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.8.0"; sha256="1cyqlzb6vykxndslwvmj9sn7hzrq3lqjwsmvkvl7ivfigrslg142"; depends=[Biobase limma mclust Ringo]; }; SomatiCA = derive2 { name="SomatiCA"; version="1.14.0"; sha256="0a6l05zvc8jkckaznflrkknm144179hp77ck0pwrcp2065bglb1z"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; }; @@ -528,36 +528,36 @@ in with self; { SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.10.0"; sha256="0p43f313qhhrpvkdsr7qzp825am6yv0cg1ypbw0kfbkgsysi7z5v"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; Starr = derive2 { name="Starr"; version="1.26.0"; sha256="0ra9x1kzr0r2wa1ihapzmldq0fdr91rfbbglmzjnq92wrw6rvkd2"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; }; Streamer = derive2 { name="Streamer"; version="1.16.0"; sha256="09bjwj9ynhjl1lgwh4444xjs4l1vj8sar5d1ph1b12fl48rb62zm"; depends=[BiocGenerics graph RBGL]; }; - SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.0.1"; sha256="0w1dwp99p6i7sc3cn0ir3dr8ksgxwjf16675h5i8n6gbv4rl9lz6"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.0.2"; sha256="1gpmh1mi70m5k5qnyjs1h0qn8ajrzalzic7k3762xchxsmmdvxn4"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; Sushi = derive2 { name="Sushi"; version="1.8.0"; sha256="1ldvv1028chnh8ng85534k924cgdmzqb3i18z6xpacsjgg5k7s7l"; depends=[biomaRt zoo]; }; SwimR = derive2 { name="SwimR"; version="1.8.0"; sha256="0vwjrpm4qbhc8afv0zj0al3rv06izp649kz8h3pb1yixw4bwrxg8"; depends=[gplots heatmap_plus R2HTML signal]; }; TCC = derive2 { name="TCC"; version="1.10.0"; sha256="1r56h2l2jcva4fi6yzch4rwllyp5hwvy93dn1rna9jjf8q5m4nkp"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="1.0.1"; sha256="0fbamvz7khpw069prgbm4inyz9fs8hg9xql8lh3h69fnfjzvld24"; depends=[affy Biobase BiocGenerics biomaRt coin ConsensusClusterPlus data_table devtools dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicFeatures GenomicRanges GGally ggplot2 gplots heatmap_plus igraph IRanges limma plyr RColorBrewer RCurl rjson rvest S4Vectors scales stringr SummarizedExperiment supraHex survival xlsx XML xml2 xtable]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="1.0.9"; sha256="12rg49xqfbgh1djirlj9bs29c6iksjs7szrd62lwpi9ljdn1sqsc"; depends=[affy Biobase BiocGenerics biomaRt coin ConsensusClusterPlus data_table devtools dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicFeatures GenomicRanges GGally ggplot2 gplots heatmap_plus igraph IRanges limma plyr RColorBrewer RCurl rjson rvest S4Vectors scales stringr SummarizedExperiment supraHex survival TxDb_Hsapiens_UCSC_hg19_knownGene xlsx XML xml2 xtable]; }; TDARACNE = derive2 { name="TDARACNE"; version="1.20.0"; sha256="0jf89s2bnz8psd7vqh3l29ch5mb2ilky2jmv8db4kcqaw9157kn8"; depends=[Biobase GenKern Rgraphviz]; }; TEQC = derive2 { name="TEQC"; version="3.10.0"; sha256="1kpibmaqqrdshbrw94080zxjlscfssddzjaqlx3l9zvhrw9sbl38"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; TFBSTools = derive2 { name="TFBSTools"; version="1.8.2"; sha256="1fnfm3masx093p879ak193v2nf62rlncq1j6wbjkhq61imyr02pm"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; }; TIN = derive2 { name="TIN"; version="1.2.0"; sha256="051v518zyqz2lrp886hqapchngqxj2kz58dchjvafgaa2l5zyy9z"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; - TPP = derive2 { name="TPP"; version="2.0.1"; sha256="0r13xm209r437p2j8n80n5zjplrd4g045nihn8bp3cnp2ickbn9c"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr RColorBrewer RCurl reshape2 VennDiagram VGAM]; }; + TPP = derive2 { name="TPP"; version="2.0.3"; sha256="152hay6h8nwjp2yfqz8wl7y6jv32h6aq9kn58vsyrjaay6kd9v2g"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr RColorBrewer RCurl reshape2 VennDiagram VGAM]; }; TRONCO = derive2 { name="TRONCO"; version="2.2.0"; sha256="1ljciqm93iqr184pyyw1rdqdqllkk548zp68zpcvv91g7kdgf7ii"; depends=[bnlearn cgdsr doParallel ggplot2 gridExtra gtable igraph RColorBrewer reshape2 Rgraphviz scales xtable]; }; TSCAN = derive2 { name="TSCAN"; version="1.8.0"; sha256="1cp723wp4g4g42l25p313lyc7hv4lp8fg95k60kpnqql356b0c7p"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; TSSi = derive2 { name="TSSi"; version="1.16.0"; sha256="16cry226v35mjgw1w1sk4kgi8cjqwkls563y088mfz6fygfmg4ld"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; }; - TarSeqQC = derive2 { name="TarSeqQC"; version="1.0.0"; sha256="1vrf712khd00rg7aj4bqgbi7kvmfndlw24ymc1k4kl5hbszyai9w"; depends=[BiocGenerics BiocParallel cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; + TarSeqQC = derive2 { name="TarSeqQC"; version="1.0.2"; sha256="1k9wf8q82yx6ygvxl9vaj8ypwaljxjv76jk8xwf994hxn1sjx7v4"; depends=[BiocGenerics BiocParallel cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; TargetScore = derive2 { name="TargetScore"; version="1.8.0"; sha256="184n05p2c9g5yc53sx29dxq1pqa3appb2s7wr6n0271c08lkqc11"; depends=[Matrix pracma]; }; - TargetSearch = derive2 { name="TargetSearch"; version="1.26.0"; sha256="1kk8qnrp8x4iijmkbqrvpyjvf7z8yd1jwp6mgjlqba5l09n65g29"; depends=[ncdf]; }; + TargetSearch = derive2 { name="TargetSearch"; version="1.26.0"; sha256="1kk8qnrp8x4iijmkbqrvpyjvf7z8yd1jwp6mgjlqba5l09n65g29"; depends=[]; }; TitanCNA = derive2 { name="TitanCNA"; version="1.8.0"; sha256="06i4gbpw356m9qxl5kj0xgnr6kvcl85qnq1z6aqjhy2x5qdiw92n"; depends=[foreach GenomeInfoDb IRanges Rsamtools]; }; ToPASeq = derive2 { name="ToPASeq"; version="1.4.0"; sha256="18fwifmih7x4wr7s3nr8qwvxbp0a33qj39sfwkvhr97jqdggb78j"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields GenomicRanges graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz TeachingDemos]; }; TransView = derive2 { name="TransView"; version="1.14.0"; sha256="02as66pzhgls2papji5mqpaczvdfpi6af0mafip8i9hj06z41wci"; depends=[GenomicRanges gplots IRanges Rsamtools zlibbioc]; }; TurboNorm = derive2 { name="TurboNorm"; version="1.18.0"; sha256="145fb32c5zi7rhnqxad6nq1vx61vc1f28qjxvnccxxb2ia3b8jcd"; depends=[affy convert lattice limma marray]; }; TypeInfo = derive2 { name="TypeInfo"; version="1.36.0"; sha256="0f0cllsf0pw2bgvq9fhfksqsxb2820js5y125vhcr0ns5kcvi07y"; depends=[]; }; UNDO = derive2 { name="UNDO"; version="1.12.0"; sha256="1qz9md9j8jhrgl7iap6im4y08nwnydzgxpanpnpsaad1irrlgcaq"; depends=[Biobase BiocGenerics boot MASS nnls]; }; - UniProt_ws = derive2 { name="UniProt.ws"; version="2.10.0"; sha256="0pskf4aw696wyv6na4qfaprqhpldf7k1kz8xfaa05ahlv94v62kd"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; }; - VanillaICE = derive2 { name="VanillaICE"; version="1.32.0"; sha256="0zhxqhykbnn27af7rgdr0cw5ll1vf1anrpjg4l2a4f7dj0dc0ggb"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; - VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.16.3"; sha256="0hlgbphra5p7551qjly5pp7zxarrdm3hj7vnif4dsmgsk8dds996"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; - VariantFiltering = derive2 { name="VariantFiltering"; version="1.6.5"; sha256="0id65ng84ndahbyg2pwwggsgbdsvbix4vjg3v3i76nx34rv2106j"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; }; + UniProt_ws = derive2 { name="UniProt.ws"; version="2.10.4"; sha256="0wx5jd45b69id7ffhyc8py15kw8nl0ii0j528xfw7m2x1xzydn6w"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; }; + VanillaICE = derive2 { name="VanillaICE"; version="1.32.2"; sha256="0qbj7rqhwmyz7dgljx6f9viy3gxnb2hnmnp8pnrj454l2hn30yj6"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; + VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.16.4"; sha256="1z42j3p9b8h725inq8n0230llsdbav3gwcxy1nliypzfkxbzahsb"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; + VariantFiltering = derive2 { name="VariantFiltering"; version="1.6.20"; sha256="1bfp9x4njgmzqc17c2mv5s9lvrzymjr2rjyhng5d8sq2ms7da9kp"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; }; VariantTools = derive2 { name="VariantTools"; version="1.12.0"; sha256="0c2sh4fda4gjxazxzd694a5cqj57mpa7f6hvafn6k40iz816x22f"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; Vega = derive2 { name="Vega"; version="1.18.0"; sha256="0f7rzzckd69xbnism0v7jl0dly55lwj30nla7yj88qqalnb7ajzs"; depends=[]; }; VegaMC = derive2 { name="VegaMC"; version="3.8.0"; sha256="004zx8hihj503g5fiq5njk09fns6ra7qvzbzb44q2dpd0n02ifqc"; depends=[Biobase biomaRt genoset]; }; - XBSeq = derive2 { name="XBSeq"; version="1.0.0"; sha256="09aiyy0b42dwckrv50d5pvfm2mggpqph9y0cn1cjcs0bpy2mb1v7"; depends=[Biobase BiocGenerics Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; }; + XBSeq = derive2 { name="XBSeq"; version="1.0.2"; sha256="01h3hj4mm7dr16vwbra5iazrgar9nbh2gs2gklyx0wqjfzm3gj49"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; }; XDE = derive2 { name="XDE"; version="2.16.0"; sha256="0zwp1vqjp3bfxvnkik9k57djnyf29qm57wlldv3zgk65lqxrdm5n"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; }; XVector = derive2 { name="XVector"; version="0.10.0"; sha256="0havwyr6xqk7w0rmbwfj9jq1djz7wzdz7w39adhklwzwz9l4ih3a"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; a4 = derive2 { name="a4"; version="1.18.0"; sha256="07969ixxf20i2xh8c29s6qgghk7qndlc8b30w9ydq5yfd8v1wdys"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; @@ -568,10 +568,10 @@ in with self; { a4Reporting = derive2 { name="a4Reporting"; version="1.18.0"; sha256="156l5qrhwlsr3vvxwpxzkgajb6pcz0ilfm4dw4jinm1kyy3k7fkr"; depends=[annaffy xtable]; }; aCGH = derive2 { name="aCGH"; version="1.48.0"; sha256="0pch06jwwdn6s6cphrn4qn0syc47crliw9s5ii3dm03nh4z6p668"; depends=[Biobase cluster multtest survival]; }; acde = derive2 { name="acde"; version="1.0.0"; sha256="039dy5ssrnf9i8ahjfmf18f3z8vk2x61zkx3snm27mr0vi7nw84n"; depends=[boot]; }; - adSplit = derive2 { name="adSplit"; version="1.40.0"; sha256="1djrgfspgi5aijpplqcq61mc4sbnfjj3rk1w3q714y2qazm0675i"; depends=[AnnotationDbi Biobase cluster multtest]; }; + adSplit = derive2 { name="adSplit"; version="1.40.0"; sha256="1djrgfspgi5aijpplqcq61mc4sbnfjj3rk1w3q714y2qazm0675i"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; }; affxparser = derive2 { name="affxparser"; version="1.42.0"; sha256="13asms378wid2kw0p2qz6q3bq6didpgkv58sbl6f8amcy5yxvkf9"; depends=[]; }; affy = derive2 { name="affy"; version="1.48.0"; sha256="1k26qw2iirhsgfmkii49azcfki5hk9lpz6v9glayq78j3rspn1sk"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; }; - affyContam = derive2 { name="affyContam"; version="1.28.0"; sha256="04xq22z965pdh5sy5lgfh2asqjxydm4mzgkz6wqk479xfqdhny5k"; depends=[affy Biobase]; }; + affyContam = derive2 { name="affyContam"; version="1.28.0"; sha256="04xq22z965pdh5sy5lgfh2asqjxydm4mzgkz6wqk479xfqdhny5k"; depends=[affy affydata Biobase]; }; affyILM = derive2 { name="affyILM"; version="1.22.0"; sha256="0a51ynrzhb2w2gkgnnnyi36xljmkjkw954541ah82x5hq14aj0wc"; depends=[affxparser affy Biobase gcrma]; }; affyPLM = derive2 { name="affyPLM"; version="1.46.0"; sha256="19ci6vc899j39s2w48f64wy9yl5ls8xmxv7gmdwk4dmp2xm6ys2h"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; }; affyPara = derive2 { name="affyPara"; version="1.30.0"; sha256="14g7xrzsqqsr2h20nv000dd3v71wq18bq78r345w29fs53kipxxd"; depends=[affy affyio aplpack snow vsn]; }; @@ -585,38 +585,38 @@ in with self; { alsace = derive2 { name="alsace"; version="1.6.0"; sha256="1vrwi2rkccgiwgshz5rxyr55dl7awbh1drbhhsrbpjsbzxwmiv4a"; depends=[ALS ptw]; }; altcdfenvs = derive2 { name="altcdfenvs"; version="2.32.0"; sha256="1sb516qazxvad2vayd7sai1vg6vq9g7vjy4cyx6c0mqw7sl0pagl"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv]; }; ampliQueso = derive2 { name="ampliQueso"; version="1.8.0"; sha256="0v21y2nd0qwnag0n6h0krr9c0vpv6ig89d0jsi58x3pi5m0mypip"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; }; - annaffy = derive2 { name="annaffy"; version="1.42.0"; sha256="1fygm19y0ixh5ir7pldx26xck3w9pz1r26ddkj6ffnp4bljd35lk"; depends=[AnnotationDbi Biobase]; }; + annaffy = derive2 { name="annaffy"; version="1.42.0"; sha256="1fygm19y0ixh5ir7pldx26xck3w9pz1r26ddkj6ffnp4bljd35lk"; depends=[AnnotationDbi Biobase GO_db KEGG_db]; }; annmap = derive2 { name="annmap"; version="1.12.0"; sha256="12ixjb9bg49wdzjl0dpxl7lv7yj63fzsjgw2pqjwcimvgamk0vdw"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; annotate = derive2 { name="annotate"; version="1.48.0"; sha256="1b9fm7b5j2vknf5bm1dj17g6wb3smzq8s02dhx4mlqnpif1av6dk"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; }; annotationTools = derive2 { name="annotationTools"; version="1.44.0"; sha256="0qqkvibnz9j8p0007zahcc07y2avgcrbsxpj5hsdn4q4qs4igjxa"; depends=[Biobase]; }; anota = derive2 { name="anota"; version="1.18.0"; sha256="0nqshv23gz2q8mqmakw0blbrynbxp2s09i120yhci4qrvay5in7w"; depends=[multtest qvalue]; }; antiProfiles = derive2 { name="antiProfiles"; version="1.10.0"; sha256="0a707qd525265am6sc8l1k9161cjm8vblkgyzmvgy14zdw4pk479"; depends=[locfit matrixStats]; }; - apComplex = derive2 { name="apComplex"; version="2.36.0"; sha256="0y84hiyzc5i7l2k1nfjfkq5gfll8nli1bqci5jl13207zhhc8jnq"; depends=[graph RBGL Rgraphviz]; }; + apComplex = derive2 { name="apComplex"; version="2.36.0"; sha256="0y84hiyzc5i7l2k1nfjfkq5gfll8nli1bqci5jl13207zhhc8jnq"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; aroma_light = derive2 { name="aroma.light"; version="3.0.0"; sha256="1mdncg64h9d7ppg626q42xyimz1s6arj5774hxhc06hq2isb5isi"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; arrayMvout = derive2 { name="arrayMvout"; version="1.28.0"; sha256="09jvfpzc1hz07rbsgkxcwiib6ihipq75k9w95bv4fdgd9i3jz4yb"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; }; arrayQuality = derive2 { name="arrayQuality"; version="1.48.0"; sha256="0cqmbf47rxa2d3is999abwk7j4kakwlb7fhxv0qw8x2j2r33vsrl"; depends=[gridBase hexbin limma marray RColorBrewer]; }; - arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.26.0"; sha256="187px5jljic7dlfam1n1y538inm852grnsad7ndc4rp0dxr41jql"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; - attract = derive2 { name="attract"; version="1.22.0"; sha256="09nizaqjnsqkxkyiyp0amyc04z2yf23gp3wqf4y1jy5x9y1kkyqz"; depends=[AnnotationDbi Biobase cluster GOstats limma]; }; + arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.26.1"; sha256="0wqxlpppysl9kwmbppnvl78rr7f8z9787yfmr02grqrly3ag83fl"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; + attract = derive2 { name="attract"; version="1.22.0"; sha256="09nizaqjnsqkxkyiyp0amyc04z2yf23gp3wqf4y1jy5x9y1kkyqz"; depends=[AnnotationDbi Biobase cluster GOstats KEGG_db limma]; }; ballgown = derive2 { name="ballgown"; version="2.2.0"; sha256="12j7y2ldnbawqyfxaybb1a9ndylvw09n0d3p001wd1inqnml4xns"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; bamsignals = derive2 { name="bamsignals"; version="1.2.0"; sha256="11yix7rzk54zy1mh49d96kvz6ka8rlb66whb6mdkd5lyx32w8lwf"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; - baySeq = derive2 { name="baySeq"; version="2.4.0"; sha256="0cmk7k88kkiv94zlr8k831gp476kam3sl06a8dgvpsyx2jpkx21l"; depends=[abind GenomicRanges perm]; }; - beadarray = derive2 { name="beadarray"; version="2.20.0"; sha256="11h4c046k9lw1mdqjb06683fmqrm8jrw6j1557ql0dcxacgv3kra"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; }; + baySeq = derive2 { name="baySeq"; version="2.4.1"; sha256="0q3gfdg9l1ipz67bcjaly6fl4pfgwd95cy2hpk4sck59lknh1jm4"; depends=[abind GenomicRanges perm]; }; + beadarray = derive2 { name="beadarray"; version="2.20.1"; sha256="1kgabdnq20i5p0yyim0m2vcp3lkn39fzlghahj9nrvrl9i4n3gyn"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; }; beadarraySNP = derive2 { name="beadarraySNP"; version="1.36.0"; sha256="1dj5zi9lkyq5lgrcmr08cjdv3ysfa6p9zc8jza8mm6vy14qsl5ah"; depends=[Biobase quantsmooth]; }; betr = derive2 { name="betr"; version="1.26.0"; sha256="1rs2xajrac3a4sk88i7zq3v849969iw0k8wmpbc0ihw9m4ljb0sx"; depends=[Biobase limma mvtnorm]; }; bgafun = derive2 { name="bgafun"; version="1.32.0"; sha256="1wakjjdcgzl9snsa9i1f7kk0ppwiccxmznd93yawvjk74gqwnkp3"; depends=[ade4 made4 seqinr]; }; bgx = derive2 { name="bgx"; version="1.36.0"; sha256="1x0i4llp6yrfybp7lwqwc7kb1s12dl8a0nwymhjd3fkfv5lslfbx"; depends=[affy Biobase gcrma]; }; - bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.14.0"; sha256="1gpmd953wis39bksg0rnpnahjgmbgj49k6chgplrglvngf1h6yxn"; depends=[bigmemory Biobase]; }; + bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.14.2"; sha256="05ksk3phvh4wc3vgfj5bl1jfxhndia90bkq9s91wfjzcfkrd41q8"; depends=[bigmemory Biobase]; }; bioDist = derive2 { name="bioDist"; version="1.42.0"; sha256="0l5f8yj76sdx7c2zf50h395a4hbqnycnzx5iw3by4rh45xs6pcxj"; depends=[Biobase KernSmooth]; }; - bioassayR = derive2 { name="bioassayR"; version="1.8.0"; sha256="09z4w22k63rqjk2rx6ffj74vcwlr5v5wkw4v4ww0kf386j5ylgim"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; }; + bioassayR = derive2 { name="bioassayR"; version="1.8.25"; sha256="0fnqdkzpyk6zr5s2yb2sr5gp4vaga0qrdxcffcri39wvzpfny4h0"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; biobroom = derive2 { name="biobroom"; version="1.2.0"; sha256="15v4s9cdvl4n5sx0n2sskhmq9xvs2cdrxxd7y4l59jgg421fzg7i"; depends=[Biobase broom dplyr tidyr]; }; biocGraph = derive2 { name="biocGraph"; version="1.32.0"; sha256="0sdnysj0dds74a7jb9qrpkix34d8ray5sp4v6c0kwzcqvax47a1s"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; - biocViews = derive2 { name="biocViews"; version="1.38.0"; sha256="1h6qi8a818a4m2slmrz8p3303hqs0hd59n049s3g1703m26n9z0k"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; }; + biocViews = derive2 { name="biocViews"; version="1.38.1"; sha256="1ydgxnzkmdfydj6x1pi46qaf8l0nlvw9ycx91zwylwbpz37mss49"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; }; biomaRt = derive2 { name="biomaRt"; version="2.26.1"; sha256="1s709055abj2gd35g6nnk5d2ai5ii09iir270l2xika6pi62gj3f"; depends=[AnnotationDbi RCurl XML]; }; biomvRCNS = derive2 { name="biomvRCNS"; version="1.10.0"; sha256="1vma189z83hvq90g6vaaw87znpk7srl2s1vikicah40s72awywm6"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; biosvd = derive2 { name="biosvd"; version="2.6.0"; sha256="0mjkan7drib9v49dk3rnrkydm1dxfqimk5gk4jm9qv8kdfcjk0zh"; depends=[Biobase BiocGenerics NMF]; }; biovizBase = derive2 { name="biovizBase"; version="1.18.0"; sha256="1lp89grxfgkhc9h5jmqs2nr9gr8321nyzwimrszls9dcc787xf00"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; }; birta = derive2 { name="birta"; version="1.14.0"; sha256="1pszpvmvjp1r0bwj7w9ws0y8xmb3yfmq5gifj9jwvgw2p7y718zr"; depends=[Biobase limma MASS]; }; - birte = derive2 { name="birte"; version="1.6.0"; sha256="1mlh8fg77lcpqdb5ali5pxx1qpdskbsljk55cbsswgsjw437fwi0"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; }; + birte = derive2 { name="birte"; version="1.6.1"; sha256="08jkjlkjswz3x4sxw80xr9ck6277ag1gzv5y1dxh7aa6i644w48p"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; }; blima = derive2 { name="blima"; version="1.4.0"; sha256="1mv153f42x0pjva03gw8b064qmf2558p82xqzvxqycyn7ry3riyz"; depends=[beadarray Biobase BiocGenerics]; }; bridge = derive2 { name="bridge"; version="1.34.0"; sha256="08lfbczaj7hkgqfsm060z56anx1yvsfwknzw40gq919k0zm9vfcf"; depends=[rama]; }; bsseq = derive2 { name="bsseq"; version="1.6.0"; sha256="1bz3b79iiqz251nq54lybxd9bfyzm44p1dbb3nxmjdnf2n1gxs5w"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats R_utils S4Vectors scales SummarizedExperiment]; }; @@ -628,28 +628,28 @@ in with self; { categoryCompare = derive2 { name="categoryCompare"; version="1.14.0"; sha256="12gqbmkh5rpbp2nqn8j1mhss3v67jiphqxw0cfgb97y6hh7bcfg6"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; }; ccrepe = derive2 { name="ccrepe"; version="1.6.0"; sha256="1h96ga660yp1bd20f5ykywybhiwzxrll2p0shkk7wqbn1x7rz1wj"; depends=[infotheo]; }; cellGrowth = derive2 { name="cellGrowth"; version="1.14.0"; sha256="0d40kll2rkzijyk0d0xb9rzyck5r0hkybv0j1ba72g9kk2mdmz7z"; depends=[lattice locfit]; }; - cellHTS = derive2 { name="cellHTS"; version="1.40.0"; sha256="061c1b8r9z9w12agprbi9r0sm9zzs2biwx1fmbkpjw6yf4fbm0x1"; depends=[genefilter prada RColorBrewer]; }; - cellHTS2 = derive2 { name="cellHTS2"; version="2.34.0"; sha256="0jfykid7wmczy749nrqkg0nympap6rmkqbsk1ywmfx4an45w1ak9"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; + cellHTS = derive2 { name="cellHTS"; version="1.40.1"; sha256="1pfvndkcmnq1jawijl7yd46jj92d6xlzhv717sd03a6skk11hwwi"; depends=[Biobase genefilter prada RColorBrewer]; }; + cellHTS2 = derive2 { name="cellHTS2"; version="2.34.1"; sha256="068lqpxhy04fhpma8cbd79jwg0cifvg8qhav5a4p22dgmalvajw1"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; cghMCR = derive2 { name="cghMCR"; version="1.28.0"; sha256="02a5a2aj35n3y34gv1j6mk3ahm27i10ahj1msbzp62w8ph9lnasx"; depends=[BiocGenerics CNTools DNAcopy limma]; }; charm = derive2 { name="charm"; version="2.16.0"; sha256="14nlmii9rqgl6y0fk0gxk11dnjr33mavchp0iban0cr0hn44inm0"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; }; - chimera = derive2 { name="chimera"; version="1.12.0"; sha256="11arbg6c76rx4zyylp6ga8ygx8890h0pkg4ciwhy4xc8x1smmq7r"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicRanges Rsamtools]; }; - chipenrich = derive2 { name="chipenrich"; version="1.8.0"; sha256="0xzh3nrw62ars7xnnj9qkdsg9yaq1q3xx63l1bi91lxbfih7k9wr"; depends=[GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; }; + chimera = derive2 { name="chimera"; version="1.12.0"; sha256="11arbg6c76rx4zyylp6ga8ygx8890h0pkg4ciwhy4xc8x1smmq7r"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + chipenrich = derive2 { name="chipenrich"; version="1.8.0"; sha256="0xzh3nrw62ars7xnnj9qkdsg9yaq1q3xx63l1bi91lxbfih7k9wr"; depends=[chipenrich_data GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; }; chipseq = derive2 { name="chipseq"; version="1.20.0"; sha256="1j3kh5alahrqfp0sxkz9b9v8fm8p5gm3nyw1nbcj20ajiapi1gnp"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; chopsticks = derive2 { name="chopsticks"; version="1.34.0"; sha256="112d4r6ns916yjxzaakghwvbin4cadijpxanm6qs08lyap5imz4s"; depends=[survival]; }; chroGPS = derive2 { name="chroGPS"; version="1.14.0"; sha256="0i0hrf38sjsay6r6zh69cy6xki17cjw427szq4h7770jlphiq8n1"; depends=[Biobase changepoint cluster DPpackage ICSNP IRanges MASS]; }; chromDraw = derive2 { name="chromDraw"; version="1.2.0"; sha256="04zcx2y8x4s3rmfljxgm4h7p7gjrhfgqfhyx6h9f96l734l4f8hs"; depends=[GenomicRanges Rcpp]; }; cisPath = derive2 { name="cisPath"; version="1.10.0"; sha256="0wqbmqpm6qbrwfnl0s4dn569s74x8g9501ckx0h2g38w961z36k3"; depends=[]; }; - cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.8.0"; sha256="1ck58mxnx4q1y8wdi8mbp8ijbg30zmfbhp5ldp09zq2m0j746183"; depends=[BiocGenerics BSgenome e1071 GenomicRanges seqinr]; }; + cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.8.0"; sha256="1ck58mxnx4q1y8wdi8mbp8ijbg30zmfbhp5ldp09zq2m0j746183"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; }; cleaver = derive2 { name="cleaver"; version="1.8.0"; sha256="057nvg1cf0prbwarqwv53r651pc1i5sjj6x9nlnshxrgjrwa47ff"; depends=[Biostrings IRanges S4Vectors]; }; clippda = derive2 { name="clippda"; version="1.20.0"; sha256="1d76air1vf29b9bmycak9fx5silkx9d8k6cpding6pw50d63wcb1"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; }; clipper = derive2 { name="clipper"; version="1.10.0"; sha256="1dyaazkwrrh6s3f2a0yj3i92jg16azf92az9lsjy3dbrwi8zhi7l"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; }; clonotypeR = derive2 { name="clonotypeR"; version="1.8.0"; sha256="1fj00hrxijkn002ixa7kn07jq94mlsgz99xr3sapzg0jqacgp9q0"; depends=[]; }; clst = derive2 { name="clst"; version="1.18.0"; sha256="0zg3cdd8j46lm750q0ckin42pmvj0hddl1j2j4lh7x50gvqwyjyz"; depends=[lattice ROC]; }; clstutils = derive2 { name="clstutils"; version="1.18.0"; sha256="169pzadyhszaxc8r7z1qysmcsijp2x5pw9bizbkkw7i92r8gf4n7"; depends=[ape clst lattice rjson RSQLite]; }; - clusterProfiler = derive2 { name="clusterProfiler"; version="2.4.1"; sha256="0l8gvpiw8aq8w5ilk178qi0ks9rl6fzbdmj4fin3vz7razayff5p"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; }; + clusterProfiler = derive2 { name="clusterProfiler"; version="2.4.3"; sha256="0fhi1dm8xifz5wzg756y12980a46cqk3mn32i7rg60f0iy2ax0s0"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim KEGGREST magrittr plyr qvalue topGO]; }; clusterStab = derive2 { name="clusterStab"; version="1.42.0"; sha256="162kq03vs5d3rnmh9kh5djal6vgyr3pzmihjgq50dp04b89ha2d8"; depends=[Biobase]; }; cn_farms = derive2 { name="cn.farms"; version="1.18.0"; sha256="0d4xwdzccs5wk52ifqryj3cp60vf4yga6ddhs97p0znafh4gfsjv"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; }; - cn_mops = derive2 { name="cn.mops"; version="1.16.1"; sha256="15gbslg2adx1lv2nhb7kws2gr4afyfb7mjb20ynpdmxjmjpng3vk"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; }; + cn_mops = derive2 { name="cn.mops"; version="1.16.2"; sha256="0c325s454rjiiyydf82vg72a7rfkj36s1dxbib42qvp1pc35rmj3"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; }; cnvGSA = derive2 { name="cnvGSA"; version="1.14.0"; sha256="1kw5161fnlc7b1b03a4kpqz4hlrknyj8dlm8wffjj1d45g1rpvwd"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; }; coGPS = derive2 { name="coGPS"; version="1.14.0"; sha256="1bylnhcvbrimjld5nar42kr577lzw97d2f4bibrbqysp332wi1iz"; depends=[]; }; coMET = derive2 { name="coMET"; version="1.2.0"; sha256="0nsz6ci6kcnanm465420sicbp84w2rg58j1550jhnrn4cx4pxm4j"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; }; @@ -657,67 +657,67 @@ in with self; { cobindR = derive2 { name="cobindR"; version="1.8.0"; sha256="06nckxm5hz6c336p5fvfmccfzdri68qcmagkyjg7nnfsyl66fri1"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; codelink = derive2 { name="codelink"; version="1.38.0"; sha256="11rs0nr0nqfmy0v4yfzd7wgq9g0rqzr7r7jcr16z79lc6f5lqm9z"; depends=[annotate Biobase BiocGenerics limma]; }; cogena = derive2 { name="cogena"; version="1.4.0"; sha256="16imyy9y4jd71pnaf41isrmw711kp4ky61bljn8kmlm9kqf2lbm0"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; - compEpiTools = derive2 { name="compEpiTools"; version="1.4.0"; sha256="0pygd78pi7h050fra41kvwcx5id9ivisdlnaqdxwk1xd07xb67ck"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; + compEpiTools = derive2 { name="compEpiTools"; version="1.4.0"; sha256="0pygd78pi7h050fra41kvwcx5id9ivisdlnaqdxwk1xd07xb67ck"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; compcodeR = derive2 { name="compcodeR"; version="1.6.0"; sha256="1f84n01c83p5x72ws7a7cam0g0l7n2wjy5pyf06hbwgc0ziz57cs"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; }; - conumee = derive2 { name="conumee"; version="1.2.0"; sha256="1410a8sby4azkj14wqxrsi5i4kiyhgnpidj70ysygk5y2mlghs4x"; depends=[DNAcopy GenomeInfoDb GenomicRanges IRanges minfi rtracklayer]; }; + conumee = derive2 { name="conumee"; version="1.2.0"; sha256="1410a8sby4azkj14wqxrsi5i4kiyhgnpidj70ysygk5y2mlghs4x"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges minfi rtracklayer]; }; convert = derive2 { name="convert"; version="1.46.0"; sha256="04zg65yylg3rifn49k015nf38v3ga0kwq4m9hykb8lfqiw63sxgq"; depends=[Biobase limma marray]; }; copa = derive2 { name="copa"; version="1.38.0"; sha256="0dmrmf60q83srilzxgwcknnd4wsx4xdlf6plfgz3wks6nyfwy256"; depends=[Biobase]; }; copynumber = derive2 { name="copynumber"; version="1.10.0"; sha256="1g03cy5inbhzhl5hj8vma34xm8lixilhalavjysp93bwg4dfskv6"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; }; - cosmiq = derive2 { name="cosmiq"; version="1.4.0"; sha256="079423bhmjk5c0x4xq8kxqbcvj8mvh30gy31zr5xn7m9lysmzglc"; depends=[MassSpecWavelet pracma Rcpp xcms]; }; + cosmiq = derive2 { name="cosmiq"; version="1.4.0"; sha256="079423bhmjk5c0x4xq8kxqbcvj8mvh30gy31zr5xn7m9lysmzglc"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; cpvSNP = derive2 { name="cpvSNP"; version="1.2.0"; sha256="1wnbl6wgflfhjkrv8l5i182mpfxk440rzacpsij0xq0f823nxxgf"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; cqn = derive2 { name="cqn"; version="1.16.0"; sha256="0cmi8nfk5yh4mma43kay8pglysd26kq17kxa98yirwgdj8cgq5rj"; depends=[mclust nor1mix preprocessCore quantreg]; }; - crlmm = derive2 { name="crlmm"; version="1.28.0"; sha256="0gd2zjhdawiy2zazjp5dgldbp2r75qqyd4qjg26p4w2nwkf8sk07"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; }; + crlmm = derive2 { name="crlmm"; version="1.28.2"; sha256="1acfd5w2h6z5ksclp7grb42p59jyjm2q4cx9pjc32y0cdvndqhy8"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; }; csaw = derive2 { name="csaw"; version="1.4.1"; sha256="1yl4ckh0289k633kj6msl6rj7rdvcd9h8gnscz6p63n4c6mfpy13"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; }; ctc = derive2 { name="ctc"; version="1.44.0"; sha256="1wlk1skc6vg10gdcdqdwc5mnh5ags7f13sxmjc19gg6n7wfkjrqg"; depends=[amap]; }; - cummeRbund = derive2 { name="cummeRbund"; version="2.12.0"; sha256="19lwy7zd8mwcqv2xzgjkqzx9ha8i6rzz4c2ca7wnh6432v9gw76s"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; }; + cummeRbund = derive2 { name="cummeRbund"; version="2.12.1"; sha256="02d9g8rzwj47faijk26q6jg7p687gw87knyycxmljr9vn7157d20"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; }; customProDB = derive2 { name="customProDB"; version="1.10.0"; sha256="04iiwfvjavn3zz6fhf24wd3xy0svviqqklg64hnwza2m4w50awag"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; }; cycle = derive2 { name="cycle"; version="1.24.0"; sha256="14xzwlwkb93bhqwwy36bsqimabpmg5an6n6y8xkh5zsxw2c7m1qi"; depends=[Biobase Mfuzz]; }; - cytofkit = derive2 { name="cytofkit"; version="1.2.0"; sha256="1k3s9yh0bgadr05p8cxmddkd14bvi87hccii7l9z7vln43zyngdb"; depends=[Biobase e1071 flowCore ggplot2 gplots reshape Rtsne vegan]; }; + cytofkit = derive2 { name="cytofkit"; version="1.2.2"; sha256="1sg6phm9lxw341rangllkiq81bz4073y6zg0d5qz0gyxywv2ycfs"; depends=[Biobase doParallel e1071 flowCore ggplot2 gplots igraph pdist plyr RANN Rcpp reshape reshape2 Rtsne shiny vegan VGAM]; }; daMA = derive2 { name="daMA"; version="1.42.0"; sha256="1qggz9hrgm2xb2dz9k9gqwygj1ywy0qwzv7lqpn58pz590mz1xds"; depends=[MASS]; }; dagLogo = derive2 { name="dagLogo"; version="1.8.0"; sha256="0knsvldhdmprqjdxcdi9ccva4fi8vx86mc257nbmj21ac72bynx3"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; }; ddCt = derive2 { name="ddCt"; version="1.26.0"; sha256="1rqh6sgw7qlyrpyxgmg6xl7df2jicxzxzq6xnp7l40w6vnjc595a"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; }; ddgraph = derive2 { name="ddgraph"; version="1.14.0"; sha256="0nmrz9cy7l31vym3fcc9m3dmgmbnd5r91p3fxpziaarphi27zszl"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; }; deepSNV = derive2 { name="deepSNV"; version="1.16.0"; sha256="1vzcyqvjzzjlm3np3yyazdvj7jdiwc2wnxghaz8rnxyzm42bmjha"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; }; - deltaGseg = derive2 { name="deltaGseg"; version="1.10.0"; sha256="1wjrdnzd4vgm8ph7smlsfvwwnxkd57qcvv1ywcg8j9n71qyrhv4m"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; + deltaGseg = derive2 { name="deltaGseg"; version="1.10.1"; sha256="0dakvg2m99wm7zg84w3pzvpwi7sjdarib8bl14wyv2bh9lxq93s3"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; }; derfinder = derive2 { name="derfinder"; version="1.4.4"; sha256="0pjsah2rgxy4584p815zwacspjwx42wv5q1h9v1rywmsbhhfmrdr"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; derfinderHelper = derive2 { name="derfinderHelper"; version="1.4.1"; sha256="1mbhr766vl8skcs74xdfx5p7812x5xbv9pgn9nl2s1d9ifcs8zf8"; depends=[IRanges Matrix S4Vectors]; }; derfinderPlot = derive2 { name="derfinderPlot"; version="1.4.1"; sha256="16zsq13v86h5zfngh8621ayw5dvb14r486dzak6lz59pqzmviw8g"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; }; destiny = derive2 { name="destiny"; version="1.0.0"; sha256="1k8nf9gws6d60fp7mh43hjiaza7zxxfkpjzmi5qj2davjqbx1wn0"; depends=[Biobase BiocGenerics FNN igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; }; dexus = derive2 { name="dexus"; version="1.10.0"; sha256="0hc28mkmnr37fmw6xw2cywla946gm0cxa8k4hi32d12cm9c24xqx"; depends=[BiocGenerics]; }; diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.52.0"; sha256="1w44iihckyjw8hpzwr0dsc558c3vzdiw2nbwysmqn0dn4w18xkj2"; depends=[minpack_lm]; }; - diffHic = derive2 { name="diffHic"; version="1.2.0"; sha256="0wxqali494vzcbr0hkbvxvcwxcwfw5q5hsvs4j3b59hy3yn2dj9x"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; }; + diffHic = derive2 { name="diffHic"; version="1.2.2"; sha256="1qa21hqsmxi2f168z6r0qlv2453ljdnldc90c789dwi3067ysjnj"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; }; diggit = derive2 { name="diggit"; version="1.2.0"; sha256="1c83jhih9sg39n7sf83ddsxwjjcqklh0ssb9a4jfyvfahsqcghcb"; depends=[Biobase ks viper]; }; dks = derive2 { name="dks"; version="1.16.0"; sha256="1l98ya4f8mnzvpj1igzbn6s9yvmv3i31ll5l7hbipk4g7n1lyqal"; depends=[cubature]; }; - domainsignatures = derive2 { name="domainsignatures"; version="1.30.0"; sha256="0rr5d57cjkp46qp2908vh3wyfdgiyaikdgbcxipizcv5a00nq0rx"; depends=[AnnotationDbi biomaRt prada]; }; + domainsignatures = derive2 { name="domainsignatures"; version="1.30.0"; sha256="0rr5d57cjkp46qp2908vh3wyfdgiyaikdgbcxipizcv5a00nq0rx"; depends=[AnnotationDbi biomaRt KEGG_db prada]; }; dualKS = derive2 { name="dualKS"; version="1.30.0"; sha256="02j9l73brxa4fgsp9cbd3w7dxllvj744rby21dkfnw2c42rcxpvz"; depends=[affy Biobase]; }; dupRadar = derive2 { name="dupRadar"; version="1.0.0"; sha256="1fk58zdrw8nwjq1cq7k3rb6nx5fxhkj1p6b6mv32ha8bxwdl3dj0"; depends=[Rsubread]; }; dyebias = derive2 { name="dyebias"; version="1.28.0"; sha256="0vahrl947rf0wlz38v7jippdlvd5yhr02y554hs1ilcdz1czmyvn"; depends=[Biobase marray]; }; - easyRNASeq = derive2 { name="easyRNASeq"; version="2.6.0"; sha256="1zp911n156ra54p2nhp3yshjn8f2aaz7g976yimw1skb9j6qr1a4"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; + easyRNASeq = derive2 { name="easyRNASeq"; version="2.6.3"; sha256="1r6q3f8zril2l0a6l18yw0is85nh4xn759mv8mxc2cmh0d4f60d5"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; ecolitk = derive2 { name="ecolitk"; version="1.42.0"; sha256="0hcigc60k11s3ha0jwxlvw9zf66x8090yq5m72q6nzzjzr9rvv1r"; depends=[Biobase]; }; - edge = derive2 { name="edge"; version="2.2.0"; sha256="06flwd2ji2iwp425l05bswawg2q64dqpm9lnp29gvlc10ghsfacc"; depends=[Biobase jackstraw MASS qvalue snm sva]; }; + edge = derive2 { name="edge"; version="2.2.1"; sha256="1hmk7ncjgb0lwm7964b6c7c425jw3d8cd3zcvrv1k5359wxzfwmc"; depends=[Biobase jackstraw MASS qvalue snm sva]; }; edgeR = derive2 { name="edgeR"; version="3.12.0"; sha256="1n3fmrms48z7bh1sz64j242f08jg32dp0l25kba60abgypg2f2fw"; depends=[limma]; }; - eiR = derive2 { name="eiR"; version="1.10.0"; sha256="0lxzkx5xyyqk91aaxm0fggs4njq7z383m7w4vcdkigbqzxlbwdqq"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; }; + eiR = derive2 { name="eiR"; version="1.10.1"; sha256="0770rawqw6ys1594f8xpnjjh0p7fav5qmbbq64byzv4hb5ldl7p0"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; }; eisa = derive2 { name="eisa"; version="1.22.0"; sha256="0p3s6z7s4d165h4w5g1h273626h5j255c0hyjv5dlrdhr4ign7v6"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; - ensemblVEP = derive2 { name="ensemblVEP"; version="1.10.1"; sha256="1xfb14b3l776r1fvn5aq0d00milydxk7djc31lhhjq1zgwjg1hpq"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="1.2.0"; sha256="11959by8g9437hsy9dg8f7281pbp5xnrqx6m6qblbk2gl8ixf882"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; + ensemblVEP = derive2 { name="ensemblVEP"; version="1.10.2"; sha256="0yhpqpjdr5z9m8khiyl8qh0sh6mqwalv6441qfmyq5wivv1nx2is"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; }; + ensembldb = derive2 { name="ensembldb"; version="1.2.2"; sha256="08mj3ccskslwqbnk0yz7s5rdh9vvp2adi7hqbz76w7zbvflfsm1v"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; epigenomix = derive2 { name="epigenomix"; version="1.10.0"; sha256="03nv36zldpjwbwassn5ca26ibdy7cd148ywp7wd6igqjg2lcgich"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; - epivizr = derive2 { name="epivizr"; version="1.8.0"; sha256="1d1rbmkjs7dlw2y4n9y9xsmgygdndzsllbwiycsg2diyq2vyc9n7"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; }; + epivizr = derive2 { name="epivizr"; version="1.8.1"; sha256="1zgxmck5rry5h6jyi5kvbf4sf8902q21b172r25i1mzyiygqwpvn"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; }; erccdashboard = derive2 { name="erccdashboard"; version="1.4.0"; sha256="1fj9wbm5sgshpnq855bq6cf13b9141p6r8gq2053k8p1gvb9gbxi"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; }; - erma = derive2 { name="erma"; version="0.2.0"; sha256="1pw5n5m0nis8crzpwd4wbfk7vija5r6r2g6jshc07vd2nya5fxsk"; depends=[Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 rtracklayer S4Vectors shiny]; }; + erma = derive2 { name="erma"; version="0.2.0"; sha256="1pw5n5m0nis8crzpwd4wbfk7vija5r6r2g6jshc07vd2nya5fxsk"; depends=[Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny]; }; eudysbiome = derive2 { name="eudysbiome"; version="1.0.0"; sha256="10id5pcs29xsicr9ffpd8rd2fqvj776wgdbn80vvym87gyn3kxxh"; depends=[plyr]; }; exomeCopy = derive2 { name="exomeCopy"; version="1.16.0"; sha256="09awyyfgs0k639nqrcrbq1k875qlyac1146w4ay6nxgijqy7iv82"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; - exomePeak = derive2 { name="exomePeak"; version="2.2.0"; sha256="1hxj9s7vjj7i5cb7c85kar445j0y8ckcy4hxlhkxrkryqq5k3q4w"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; }; + exomePeak = derive2 { name="exomePeak"; version="2.2.2"; sha256="03xj0h1cgxzbp2fk830l771jmmcll1bq81xips8hjgng3ywz5m1a"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; }; explorase = derive2 { name="explorase"; version="1.34.0"; sha256="108p864qq8zh4x7p765ygrdkj4r0vm3s2fmi3scswkhcv3vjcjg3"; depends=[limma rggobi RGtk2]; }; fCI = derive2 { name="fCI"; version="1.0.0"; sha256="17d592qmyia0j91sx8qlsv5xi3d4akd41rdqz0gsvnsbc5c494qn"; depends=[FNN gtools psych rgl VennDiagram zoo]; }; fabia = derive2 { name="fabia"; version="2.16.0"; sha256="0fm7bkqydks0qqfiifbkf5i7z8jb9l8bpbwkfy0kw4wfnzn4j7n8"; depends=[Biobase]; }; - facopy = derive2 { name="facopy"; version="1.4.0"; sha256="197x9wppdnvmdlgjiyv55mfqk0z5bbbmz6m2g774yva165rvdfdl"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; }; + facopy = derive2 { name="facopy"; version="1.4.1"; sha256="07ggz86c48rz8asqvfglrvsimnzh3ii43kzpm8ji6sd43i141650"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; }; factDesign = derive2 { name="factDesign"; version="1.46.0"; sha256="0i9aqf0asg0jzvb0ngdyfydgxgwwbxkhmzgc20r8ybjc3rgw0xk6"; depends=[Biobase]; }; farms = derive2 { name="farms"; version="1.22.0"; sha256="1jmx5rajm6fkhx5gfpwh8nsqw0plhfzy1bibvkdf83arxjjr6s59"; depends=[affy Biobase MASS]; }; - fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.6.0"; sha256="0zpighffcwbp5a94q3a6d8kagcy8b2nmsxyriy6kf7r99anz329p"; depends=[Hmisc LiquidAssociation WGCNA]; }; + fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.6.1"; sha256="188jq7g1qy5m05aqsyq51cq56zwf6k3awk3285kx4w3328gr6s2m"; depends=[Hmisc LiquidAssociation WGCNA]; }; fastseg = derive2 { name="fastseg"; version="1.16.0"; sha256="0js8vf2s8vya0iwd8158agbhzppgicvsnvm5lhyhhg5zs49b71hb"; depends=[Biobase BiocGenerics GenomicRanges IRanges]; }; fdrame = derive2 { name="fdrame"; version="1.42.0"; sha256="1kqhryvy4wb0c3dj76crlxvgr0h41znh8kn624n51ipfp34n5fgi"; depends=[]; }; ffpe = derive2 { name="ffpe"; version="1.14.0"; sha256="0vdssf9ljk3x7zhx5x5af5wqhynkaz8pb6sr8zp6ihqfiw498r0q"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; }; - flagme = derive2 { name="flagme"; version="1.26.0"; sha256="1h9aa6s1r2g6sr81aslqq6jydyn98j9bbcy5q7dp9zf4agfd2n8h"; depends=[CAMERA gplots MASS SparseM xcms]; }; + flagme = derive2 { name="flagme"; version="1.26.0"; sha256="1h9aa6s1r2g6sr81aslqq6jydyn98j9bbcy5q7dp9zf4agfd2n8h"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; }; flipflop = derive2 { name="flipflop"; version="1.8.0"; sha256="1blqi39kmyy2zq6lb42nk30dcc0ivgqf8hifvil2j4iv650i5476"; depends=[GenomicRanges IRanges Matrix]; }; flowBeads = derive2 { name="flowBeads"; version="1.8.0"; sha256="0nshbwv0wma33di9q1cih4kvfsfwvzwj0nd6qymq6zvxijl57231"; depends=[Biobase flowCore knitr rrcov xtable]; }; flowBin = derive2 { name="flowBin"; version="1.6.0"; sha256="0icz00h87gmwl04kbbjkrsr2k6d8migkcgcld8hag23bspdfphrl"; depends=[BiocGenerics class flowCore flowFP limma snow]; }; @@ -725,7 +725,7 @@ in with self; { flowCL = derive2 { name="flowCL"; version="1.8.0"; sha256="064946w944gw7l0hizw974i21cahzvfj1xza8f7ay9rx2baz28sh"; depends=[Rgraphviz SPARQL]; }; flowClean = derive2 { name="flowClean"; version="1.6.0"; sha256="0ck0fqbx7zrj56nn4c30qgbn5rncqch8kcc6dra6nxib9p9hy0db"; depends=[bit changepoint flowCore sfsmisc]; }; flowClust = derive2 { name="flowClust"; version="3.8.0"; sha256="1w2a9ls1cyvfwx8b7vcmxxzyj1crdpyifqld99lcwcnz5g6cw9cj"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; }; - flowCore = derive2 { name="flowCore"; version="1.36.1"; sha256="0ii12ml1cbg4x7cydahnycvj29k6hxdfg78pyr3fgfcly13y771z"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; }; + flowCore = derive2 { name="flowCore"; version="1.36.9"; sha256="0fzjc76p6d7w4rl57qc7vqc6bn9f6xy8dvdgrdh6hksqxrdxgl3a"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; }; flowCyBar = derive2 { name="flowCyBar"; version="1.6.0"; sha256="0j9hdcgkh1glfyxa9wcwpdxrkn3vgfns7w15xp341m2c4lf7rq7s"; depends=[gplots vegan]; }; flowDensity = derive2 { name="flowDensity"; version="1.4.0"; sha256="1gr9rd3brxqpg3dzgsrvrz104lvzcs8kf50zbx2nh22viyv1kmfp"; depends=[car flowCore GEOmap gplots RFOC]; }; flowFP = derive2 { name="flowFP"; version="1.28.0"; sha256="0sa17dnn2x1wq4mk719nbfpabjslyv8aafc8i0g09dlb9zm303q7"; depends=[Biobase BiocGenerics flowCore flowViz]; }; @@ -740,22 +740,22 @@ in with self; { flowQB = derive2 { name="flowQB"; version="1.14.0"; sha256="1swsdqra8w8z27p2mv1q37ydak7rjifxm78h5x6mhv1vfq4faz12"; depends=[Biobase flowCore MASS]; }; flowStats = derive2 { name="flowStats"; version="3.28.1"; sha256="1i9x94qk4cq1fkix9r2qn34k74v2i732ldj2s68ynqniyvsj6vdb"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS mvoutlier]; }; flowTrans = derive2 { name="flowTrans"; version="1.22.0"; sha256="0rqg12avmpr169i3jd1rd1ncpzkplm840nhv9h0gcqirai70pqhc"; depends=[flowClust flowCore flowViz]; }; - flowType = derive2 { name="flowType"; version="2.8.0"; sha256="1wbh440myrcjjrlwwhc0z9fmjrjmnm0navy4z8dznxzyx38sffcy"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; }; + flowType = derive2 { name="flowType"; version="2.8.1"; sha256="1ck940f18s89h8iqbkspibykr68473vb93graah3gqn7svw6970g"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; }; flowUtils = derive2 { name="flowUtils"; version="1.34.0"; sha256="0qba66cfsy8facvdpnl5jf71xwaqs3w6j2z0ph7c39zyng0nibwp"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; }; flowVS = derive2 { name="flowVS"; version="1.2.0"; sha256="0hls6c9s3h470hzayfd1k9vn5v146cymfp2b20hzjyc6dg20fj2s"; depends=[flowCore flowStats flowViz]; }; - flowViz = derive2 { name="flowViz"; version="1.34.0"; sha256="10i73d2n69p40i4504xrjax3pr3b2hkarp0fn6y9yvfr9jb4nd97"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; - flowWorkspace = derive2 { name="flowWorkspace"; version="3.16.3"; sha256="1lh2x85gqi930plkvglbrbd694yn0ls8qkha5xh6ljxzhzdl0kg2"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; }; + flowViz = derive2 { name="flowViz"; version="1.34.1"; sha256="1ggy8lgkf2j00l8cg4mijg9yydxr4gmfnby0ngiynk94h3i68z94"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="3.16.15"; sha256="1pydk53x2myb97lfyc5wkynbwxb23p519m0krcq3g77n2baa9567"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowUtils flowViz graph gridExtra jsonlite lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; }; flowcatchR = derive2 { name="flowcatchR"; version="1.4.0"; sha256="0rd9sg3d17ihrm4zz4jpvv3n4xcz4djcfnsvx6qzkri2vjmk7spj"; depends=[abind BiocParallel colorRamps EBImage rgl]; }; - fmcsR = derive2 { name="fmcsR"; version="1.12.0"; sha256="0qyd2l6ny7mjargfa1wbiwp5m4ylz65qr8c150h8q3ivqvvnmg2r"; depends=[BiocGenerics ChemmineR RUnit]; }; + fmcsR = derive2 { name="fmcsR"; version="1.12.2"; sha256="1mv6ds20m9b0b2326cxy486kri2fa40lm23ck2sx1vf6lsnfh6g6"; depends=[BiocGenerics ChemmineR RUnit]; }; focalCall = derive2 { name="focalCall"; version="1.4.0"; sha256="1dqk0lda24lkhfsid15c6n121s63zbk6658za5qxqkxdd82z7axf"; depends=[CGHcall]; }; frma = derive2 { name="frma"; version="1.22.0"; sha256="0j4zxxmmgd9jq9g7if7y0i7fkiynfikkll05p14h2jrmn2ywimdm"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; frmaTools = derive2 { name="frmaTools"; version="1.22.0"; sha256="1lxjr8yzi2hna5yygyaqxr5fqxfis4k3aczljlpm86mp8r6f80qa"; depends=[affy Biobase DBI preprocessCore]; }; gCMAP = derive2 { name="gCMAP"; version="1.14.0"; sha256="09dcaq0763kb399wh232n6r1s8qkj0c4zcmpjp6cz08w6n7lchgx"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.10.0"; sha256="00qx90gycqqca8b3brkl0bkckn7saqz9z38vinhjxlyaanc9v6ml"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; - gQTLBase = derive2 { name="gQTLBase"; version="1.2.0"; sha256="1wg16wg30z0mxn74asqa39841h18zyqk3i84gybgr4iqyxxzk5g7"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors]; }; + gQTLBase = derive2 { name="gQTLBase"; version="1.2.1"; sha256="1a1ndjjp2zn1lsfahpvi3xhkdgwl5wk0bdm7kc92aidq50a2db42"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors]; }; gQTLstats = derive2 { name="gQTLstats"; version="1.2.0"; sha256="1cwri36z85zyyr48dkkl7qkgbx9fpv7y38mbbm470adc7ac56zbv"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr ffbase foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; }; gaga = derive2 { name="gaga"; version="2.16.0"; sha256="198521xnznvwg8k5l6pak3jcyp9ml3hbzjk10vdj926izslnfavw"; depends=[Biobase coda EBarrays mgcv]; }; - gage = derive2 { name="gage"; version="2.20.0"; sha256="0j47655dxdrjbqkg36anlkkklhkkf11b9lxl3hv2xgmb0z20c018"; depends=[AnnotationDbi graph KEGGREST]; }; + gage = derive2 { name="gage"; version="2.20.1"; sha256="08lq8j07c855v54xia97ykkd81307xyh30lbcwv7by5grnkrxqbp"; depends=[AnnotationDbi graph KEGGREST]; }; gaggle = derive2 { name="gaggle"; version="1.38.0"; sha256="0bl60nca27rkij061h6g16ddlkq29rb1wh5pr2hz87y74pmb8m2w"; depends=[graph rJava RUnit]; }; gaia = derive2 { name="gaia"; version="2.14.0"; sha256="099imzsa7pghp7qbxjjnfrqc8zkn25wm5xj9jn40m9as11zxdrsx"; depends=[]; }; gaucho = derive2 { name="gaucho"; version="1.6.0"; sha256="1c1aaidhdv9rr2v3q6832q0ajc3g7l4gfx1rhf27kv4pn1j5s23s"; depends=[GA graph heatmap_plus png Rgraphviz]; }; @@ -767,32 +767,32 @@ in with self; { genArise = derive2 { name="genArise"; version="1.46.0"; sha256="1a85r7lbbz090k2kiza97b18vh4gn01wqp7qs8a8skxina6qsig6"; depends=[locfit tkrplot xtable]; }; geneRecommender = derive2 { name="geneRecommender"; version="1.42.0"; sha256="0823w9haab5wc06rk9853l07vgwpzxpivh84y3av6mhfn36lz0id"; depends=[Biobase]; }; geneRxCluster = derive2 { name="geneRxCluster"; version="1.6.0"; sha256="1blkzf503bfdfvbagbk41167qkd05mdxd96lav5fz1ry780i8lb7"; depends=[GenomicRanges IRanges]; }; - genefilter = derive2 { name="genefilter"; version="1.52.0"; sha256="1v7jr2qz90102hzcw529mdnnmrcyvavwl4axpjflcrg4p7iy2hqx"; depends=[annotate AnnotationDbi Biobase survival]; }; + genefilter = derive2 { name="genefilter"; version="1.52.1"; sha256="1pl1vbxfajms26734iprqlb4w1ly2w5101z8d895znc4lfbp6mvs"; depends=[annotate AnnotationDbi Biobase survival]; }; genefu = derive2 { name="genefu"; version="2.2.0"; sha256="0q49hnxz59hack7j28haazia6qd5pkmgyq5jaypvaa3jnvcsfij7"; depends=[AIMS amap biomaRt iC10 mclust survcomp]; }; geneplotter = derive2 { name="geneplotter"; version="1.48.0"; sha256="13ivmp486m1ka0ww3kdg5k5czps9plnrn9p6maq2gdq8dlkgvdly"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; genoCN = derive2 { name="genoCN"; version="1.22.0"; sha256="0irc6cwlaf71g76vrijw6z499aiw0h8mll0521cc12hs4wq9060z"; depends=[]; }; - genomation = derive2 { name="genomation"; version="1.2.1"; sha256="1mzs995snwim13qk9kz4q3nczpnbsy1allwp4whfq0cflg2mndfr"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer seqPattern]; }; + genomation = derive2 { name="genomation"; version="1.2.2"; sha256="0kvzwc21zsh2c8d34yn935ncn38bfkpzmknycd8h7b0521x20mi9"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer seqPattern]; }; genomeIntervals = derive2 { name="genomeIntervals"; version="1.26.0"; sha256="0fnxrxb1lk59608kcpc19yxrz3all346qh7rs668f3kk7hj456gb"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; }; - genomes = derive2 { name="genomes"; version="2.16.0"; sha256="1cb0bjlcswz26ijl23vq5fklab9lq3sip3w2fip0818fg1gldffy"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; }; + genomes = derive2 { name="genomes"; version="2.16.1"; sha256="1wcb1x0srfk36r70xn80fka33942c4jn0qq1rhg375m9bqmrwj84"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; }; genoset = derive2 { name="genoset"; version="1.24.0"; sha256="0xxh23sdb5qjfh97a2psp70zb54zx40x8501bpp7gzgqbfn1wf7w"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; genotypeeval = derive2 { name="genotypeeval"; version="1.0.0"; sha256="1clljhqy57yy0ss9700zfnsgnby3dism8z2682xjhzzprg049cx4"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; gespeR = derive2 { name="gespeR"; version="1.2.0"; sha256="0s8lndwwqkkkiyqzi8xpqz6clzjrkmkkrh2f1ch80hvfj83rb89d"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; - ggbio = derive2 { name="ggbio"; version="1.18.1"; sha256="0ll7nz0ivrym2vfi5a5qgsi7v9w7mqfvlv944gn4ppg201jsad5p"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - ggtree = derive2 { name="ggtree"; version="1.2.3"; sha256="0070ldf2dl2723s03wabi1ii5fkkzf1jm39h2rqf0kh0zk76lf22"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; }; + ggbio = derive2 { name="ggbio"; version="1.18.5"; sha256="0pj0v4frj9dhyyq5mb8vls1dnlv1lvah9csrg9rz33x61px7iplq"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; + ggtree = derive2 { name="ggtree"; version="1.2.17"; sha256="1r0zxwab7pp5zhxgcpir24kzwv2vgw1fm04wqbfy2in3pj2phr64"; depends=[ape Biostrings ggplot2 jsonlite magrittr tidyr]; }; girafe = derive2 { name="girafe"; version="1.22.0"; sha256="1l7vdfrvr0y0l1lwnsyzkbx8p35rkmxnnclfqqqailhy5q5prjp2"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; globaltest = derive2 { name="globaltest"; version="5.24.0"; sha256="0a1q8r581vq4srpy57ixbcnb87ajiazj5dzyswyjfhs2l9z5zhdq"; depends=[annotate AnnotationDbi Biobase survival]; }; gmapR = derive2 { name="gmapR"; version="1.12.0"; sha256="1zzhy2cmqg0npyc6zilsjb8dn48dyva7xb8b7d6czgwb4rvyrsrr"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - goProfiles = derive2 { name="goProfiles"; version="1.32.0"; sha256="0knflwy6yarkp5r3l5q14pkcmbwpivgylfd33a8xwn3w87qk9gxw"; depends=[AnnotationDbi Biobase]; }; - goTools = derive2 { name="goTools"; version="1.44.0"; sha256="0sq4l1ayh65x7b0spmffxqx68cll8wgbj30cp0ylnyb6s78whr6q"; depends=[AnnotationDbi]; }; - goseq = derive2 { name="goseq"; version="1.22.0"; sha256="0zfly8fl77s59j6sdgn4c0gfwwsm1q8r57pf4h6zgxnbahll2b10"; depends=[AnnotationDbi BiasedUrn BiocGenerics mgcv]; }; + goProfiles = derive2 { name="goProfiles"; version="1.32.0"; sha256="0knflwy6yarkp5r3l5q14pkcmbwpivgylfd33a8xwn3w87qk9gxw"; depends=[AnnotationDbi Biobase GO_db]; }; + goTools = derive2 { name="goTools"; version="1.44.0"; sha256="0sq4l1ayh65x7b0spmffxqx68cll8wgbj30cp0ylnyb6s78whr6q"; depends=[AnnotationDbi GO_db]; }; + goseq = derive2 { name="goseq"; version="1.22.0"; sha256="0zfly8fl77s59j6sdgn4c0gfwwsm1q8r57pf4h6zgxnbahll2b10"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; gpls = derive2 { name="gpls"; version="1.42.0"; sha256="1a8qhyyidx3rnipjr42q2jzgcjljij2g6a22dlk9p350sf426i0f"; depends=[]; }; gprege = derive2 { name="gprege"; version="1.14.0"; sha256="0mc8x8faj8pf8zb3mywjscn2rzs7bc0ws507a32r7zl5j8p9rzag"; depends=[gptk]; }; graph = derive2 { name="graph"; version="1.48.0"; sha256="16w75rji3kv24gfv44w66y1a2y75ax26rl470y3ypna0ndc3rrcd"; depends=[BiocGenerics]; }; graphite = derive2 { name="graphite"; version="1.16.0"; sha256="19dzzmy3jm555iz3wn6m0izn7xpl66q1rfngfcyg3czz266x4kv4"; depends=[AnnotationDbi BiocGenerics graph rappdirs]; }; - groHMM = derive2 { name="groHMM"; version="1.4.0"; sha256="0vsgw71rkj0v3qf5yjszb4isvlfz4p57ns18xwpm1vgh8arbdm90"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; + groHMM = derive2 { name="groHMM"; version="1.4.1"; sha256="0ndbdn2jqnyla7malppza9f92x7wybbg0n7lfl1ydwx53mwndpz6"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; }; gtrellis = derive2 { name="gtrellis"; version="1.2.0"; sha256="00alv9amhwgcpzy8g2av46r183070nansvswai0m9ppd4rhc53zh"; depends=[circlize GetoptLong]; }; - gwascat = derive2 { name="gwascat"; version="2.2.0"; sha256="06v3rc21riv53qpvaizsbrsi5zdmz1fzjhbjf741wkgbh280g6gl"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; }; - h5vc = derive2 { name="h5vc"; version="2.4.0"; sha256="1giplzxvila00bqjlwdzb5c53z9l5zhzs2yv83ss3f5zsd1k92lm"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges reshape rhdf5 Rsamtools S4Vectors]; }; + gwascat = derive2 { name="gwascat"; version="2.2.0"; sha256="06v3rc21riv53qpvaizsbrsi5zdmz1fzjhbjf741wkgbh280g6gl"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; }; + h5vc = derive2 { name="h5vc"; version="2.4.1"; sha256="17d5y6hzwjmj9dayrdss0shjqkphv12p70s8g7052q6sljx8iwc2"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; }; hapFabia = derive2 { name="hapFabia"; version="1.12.0"; sha256="019fsyc3a2myxapjk2wx978q9jkhsz2889rkvs7vb0aqf8bg0psr"; depends=[Biobase fabia]; }; hiAnnotator = derive2 { name="hiAnnotator"; version="1.4.0"; sha256="0i4bxzxvqll1n5ardclkfg70hijy3mv4la90g4y6ycl66q0mycrn"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.6.0"; sha256="1cszyap1cngrfx59mf76826iiwahlhj2l6iv97470nmx5a9rymkh"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator rSFFreader sonicLength xlsx]; }; @@ -811,7 +811,7 @@ in with self; { iGC = derive2 { name="iGC"; version="1.0.0"; sha256="091bm1qssl8ngiv9cbl6i7mdgi65l1ywk5a78jl01j414h190bra"; depends=[data_table plyr]; }; iPAC = derive2 { name="iPAC"; version="1.14.0"; sha256="1gzxv6jkn7crylklmnvhm86gczmsr80dmw1a7flaisiiy40k128g"; depends=[Biostrings gdata multtest scatterplot3d]; }; iSeq = derive2 { name="iSeq"; version="1.22.0"; sha256="1bh2s5cc7jsz1gdh0f5f09izm3b2pjmzbhmr0vyp1b9nc12i35v9"; depends=[]; }; - ibh = derive2 { name="ibh"; version="1.18.0"; sha256="0damqv5bn9fyki7ghqflz8bzg42v3wf1gi173adk9hpj9glic73j"; depends=[]; }; + ibh = derive2 { name="ibh"; version="1.18.0"; sha256="0damqv5bn9fyki7ghqflz8bzg42v3wf1gi173adk9hpj9glic73j"; depends=[simpIntLists]; }; idiogram = derive2 { name="idiogram"; version="1.46.0"; sha256="154hrvq86bm8f51mbgzfzg3gjyzzlnsl3yfmqglk78smj2a152lf"; depends=[annotate Biobase plotrix]; }; illuminaio = derive2 { name="illuminaio"; version="0.12.0"; sha256="1mjgs1kf4wzb3zvqyq4w81sqrb4nrf6qwdlg6hz471xh6c3b7avb"; depends=[base64]; }; imageHTS = derive2 { name="imageHTS"; version="1.20.0"; sha256="1dg8cmrnzlv2qm5lf9771fiir5l0cql6pmfmv0l3037wisdgz1jw"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; @@ -830,27 +830,27 @@ in with self; { jmosaics = derive2 { name="jmosaics"; version="1.10.0"; sha256="1q67ylrgc2abny2wxgsl1cni225inar1dhim0psrbrf5ik77kgmk"; depends=[mosaics]; }; joda = derive2 { name="joda"; version="1.18.0"; sha256="0fjbxczwkn8f4p0h8dgi3vfn4qf9a650wmp01q20j7f0jsmmb06x"; depends=[bgmm RBGL]; }; kebabs = derive2 { name="kebabs"; version="1.4.1"; sha256="1fqvp17x6z7hpgh4z71npvvskhd4j68g3p67ifc8phrmlqyaa84d"; depends=[Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; - keggorthology = derive2 { name="keggorthology"; version="2.22.0"; sha256="1sl0h63f3vvydbbj90hp5arswr6mzj5xlhqa6wbj3jhyq169qi5x"; depends=[AnnotationDbi DBI graph]; }; + keggorthology = derive2 { name="keggorthology"; version="2.22.0"; sha256="1sl0h63f3vvydbbj90hp5arswr6mzj5xlhqa6wbj3jhyq169qi5x"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; lapmix = derive2 { name="lapmix"; version="1.36.0"; sha256="1ambwxc4j6y959ww48s09pyrf4v1fghv6grybmy41vhczqvqhkdx"; depends=[Biobase]; }; ldblock = derive2 { name="ldblock"; version="1.0.0"; sha256="1snzfyfvji26n5j9jl9ib9wj7m8aln187zchpv182szrivqd1yqc"; depends=[Matrix snpStats]; }; les = derive2 { name="les"; version="1.20.0"; sha256="0dgajsws35qg1x5i12hnp0p3qixq6nqsxm16qws93vhvgmnl540a"; depends=[boot fdrtool gplots RColorBrewer]; }; lfa = derive2 { name="lfa"; version="1.0.0"; sha256="1lxirjinq6r3g749li0m8llrv195q9kjcwmd9gyvk84i570nliy9"; depends=[corpcor]; }; - limma = derive2 { name="limma"; version="3.26.3"; sha256="1akhbsagrshqhm9wjjddikmwwakgxz2zq8r58ms7fibl6wn5x0wa"; depends=[]; }; + limma = derive2 { name="limma"; version="3.26.8"; sha256="0pw91q8ahjzagyx7p564z812lczvbbc6m4mymwn30di8xv1vd3mv"; depends=[]; }; limmaGUI = derive2 { name="limmaGUI"; version="1.46.0"; sha256="14avwg48kf0m203yzlz69nbn2zcw65v70d6lkf65ahkl3rapij1h"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; }; - lmdme = derive2 { name="lmdme"; version="1.12.0"; sha256="102v67asih0czi8yrc9v859dwfb2c3s14qppcjdif6b04xs92pgv"; depends=[limma pls]; }; + lmdme = derive2 { name="lmdme"; version="1.12.0"; sha256="102v67asih0czi8yrc9v859dwfb2c3s14qppcjdif6b04xs92pgv"; depends=[limma pls stemHypoxia]; }; logicFS = derive2 { name="logicFS"; version="1.40.0"; sha256="10c154jy6lrycsnk8912572m5hjv2ngf2q3gr1wmavyan4bsqwvd"; depends=[LogicReg mcbiopi]; }; logitT = derive2 { name="logitT"; version="1.28.0"; sha256="1qbimjjl5xv5h30r74bd86dg10djajb01qav6gp95l6f59fx2j1q"; depends=[affy]; }; lol = derive2 { name="lol"; version="1.18.0"; sha256="0dc3ga7yalzfngh3y33sa4bchhbxgndkls3vdxh4yzcsdvk60i1f"; depends=[Matrix penalized]; }; lpNet = derive2 { name="lpNet"; version="2.2.0"; sha256="0sscs69mwzsz8bifgkmaa08zms6vqqls727p8gz4zq79nlw726yj"; depends=[lpSolve nem]; }; - lumi = derive2 { name="lumi"; version="2.22.0"; sha256="13r90jw238zgz668q57ns3v236l7fxr020sjvjlh1c7nhjh266a5"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; - mAPKL = derive2 { name="mAPKL"; version="1.2.0"; sha256="1k1yxxj6371sagiy63fl1dh8d71cqg6gvx8pkjy3ahp1hbh45b6l"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; }; + lumi = derive2 { name="lumi"; version="2.22.1"; sha256="0c1vzplvjk6b9p81cj76vs5rp33swdp0m142hwbw4jfw46rx0aqq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; }; + mAPKL = derive2 { name="mAPKL"; version="1.2.0"; sha256="1k1yxxj6371sagiy63fl1dh8d71cqg6gvx8pkjy3ahp1hbh45b6l"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; }; mBPCR = derive2 { name="mBPCR"; version="1.24.0"; sha256="1n9s75jx7pkq8vsq2ycyfgnk5mrfx3lr0ykp486ns8xmas3yyn3c"; depends=[Biobase oligoClasses SNPchip]; }; mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.4.0"; sha256="0flb1lqsq7ldicidag20icnhmds2qr85yrbjsv4h06klggq2vjvg"; depends=[GenABEL MASS outliers qtl]; }; maCorrPlot = derive2 { name="maCorrPlot"; version="1.40.0"; sha256="1chv95b3fi1jiy7nbxfj4szhjqm1ycb3xarjrd20xln5msainf7h"; depends=[lattice]; }; - maPredictDSC = derive2 { name="maPredictDSC"; version="1.8.0"; sha256="08wb622jp98xnqx8hh09n98ln8ifc21c0bc5gah5y68ldmg0x2iw"; depends=[affy AnnotationDbi caret class e1071 gcrma limma MASS ROC ROCR]; }; + maPredictDSC = derive2 { name="maPredictDSC"; version="1.8.0"; sha256="08wb622jp98xnqx8hh09n98ln8ifc21c0bc5gah5y68ldmg0x2iw"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; }; maSigPro = derive2 { name="maSigPro"; version="1.42.0"; sha256="06a69r685qpjyi49yq7lw444533m9hhqb56fpki2w0067wh6a54m"; depends=[Biobase limma MASS Mfuzz]; }; maanova = derive2 { name="maanova"; version="1.40.0"; sha256="112hbyfw18dshshsmbaylwra169w6bbwwqql3d96s0in1fl20mdl"; depends=[Biobase]; }; - macat = derive2 { name="macat"; version="1.44.0"; sha256="0hsw6m4x3fif4iniblkq59c3pb6g6qasidcxnw95xi90vz6h86zb"; depends=[annotate Biobase]; }; + macat = derive2 { name="macat"; version="1.44.1"; sha256="061y6a1q7c9r9a01hy6l86wc085f530y7hjw7asx506cf91ifwdk"; depends=[annotate Biobase]; }; made4 = derive2 { name="made4"; version="1.44.0"; sha256="161vs8jbc711n9x67i31818a3nzjp74rm3dw20aqrhfbikvi9r7g"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; maigesPack = derive2 { name="maigesPack"; version="1.34.0"; sha256="08pszyq03f1vjgirq0zcv31m4c0acdbfh622qiw0x0w1gz6plm0g"; depends=[convert graph limma marray]; }; makecdfenv = derive2 { name="makecdfenv"; version="1.46.0"; sha256="0ca7hc4apamg8i2b8fb56mchksw26jj139clq3vxw6nl4ny9ipvg"; depends=[affy affyio Biobase zlibbioc]; }; @@ -860,61 +860,61 @@ in with self; { massiR = derive2 { name="massiR"; version="1.6.0"; sha256="1wfvzx2ysl2hlcx4nlzfw5lb4bal6ysmyzf6gw3y4023dyrlzb64"; depends=[Biobase cluster diptest gplots]; }; matchBox = derive2 { name="matchBox"; version="1.12.0"; sha256="1p92c8vp9c65g8qzb3jlz7lniizpkymry1mh4p7izclf5mrrwk3s"; depends=[]; }; mcaGUI = derive2 { name="mcaGUI"; version="1.18.0"; sha256="0rxhs059z0l6lal33m78hkp73k46c2pdy0nn5lxwxr590fglvh0f"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; }; - mdgsa = derive2 { name="mdgsa"; version="1.2.0"; sha256="05lqj7d4464z976w4rvnzpv1abihq1fpxhcl2zyg5izwqpq6ga9r"; depends=[AnnotationDbi cluster DBI Matrix]; }; + mdgsa = derive2 { name="mdgsa"; version="1.2.0"; sha256="05lqj7d4464z976w4rvnzpv1abihq1fpxhcl2zyg5izwqpq6ga9r"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; }; mdqc = derive2 { name="mdqc"; version="1.32.0"; sha256="1aaria9nm9b4bl6r4lx0icjb20zrxcc0g8bj9jn2d04s8bzihmjw"; depends=[cluster MASS]; }; - meshr = derive2 { name="meshr"; version="1.6.0"; sha256="10b6ay5249f12rs278mvz6mjj82x48jfmn0x5crpa0jy3hhvzs2y"; depends=[BiocGenerics Category cummeRbund fdrtool MeSHDbi S4Vectors]; }; + meshr = derive2 { name="meshr"; version="1.6.2"; sha256="1gpdfgzxcaz0m2a6aji7zmr7bymdh7h4cd5agcwl3ip3lzsj76nb"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; }; messina = derive2 { name="messina"; version="1.6.0"; sha256="039409wfdbv4hcj4zif581dy03l1wqg7nr1g8yc7ispqwpxnhwzf"; depends=[foreach ggplot2 plyr Rcpp survival]; }; metaArray = derive2 { name="metaArray"; version="1.48.0"; sha256="1zx9ymjqh851r33jv7fpyy4319fqi2kgjgxxbgpq1xl6cfkglr4h"; depends=[Biobase MergeMaid]; }; metaMS = derive2 { name="metaMS"; version="1.6.0"; sha256="1kkxx5hvjkljzrdq6g00dzw0k8y15h7q2fa9j8899jvq9p11yyiq"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; }; metaSeq = derive2 { name="metaSeq"; version="1.10.0"; sha256="10nx4jr2mwk5zw6mag0j6v2rnn6h0pnp97pdmmsz8fgkx6245ygm"; depends=[NOISeq Rcpp snow]; }; - metaX = derive2 { name="metaX"; version="1.0.0"; sha256="0bhgkbdv0mc5s4hqmjnfz5f7fkfmskgfx2war7pna63d955i1k9c"; depends=[ape BBmisc boot bootstrap CAMERA caret data_table DiffCorr DiscriMiner doParallel dplyr ggplot2 igraph impute lattice missForest mixOmics Nozzle_R1 pcaMethods pheatmap pls plyr preprocessCore pROC RColorBrewer RCurl reshape2 scatterplot3d SSPA stringr VennDiagram vsn xcms]; }; + metaX = derive2 { name="metaX"; version="1.0.2"; sha256="1mqxwb4p1mw5821apyqb22vq2f091n95yar4x4h6cf1h3jxglj12"; depends=[ape BBmisc boot bootstrap CAMERA caret data_table DiffCorr DiscriMiner doParallel dplyr faahKO ggplot2 igraph impute lattice missForest mixOmics Nozzle_R1 pcaMethods pheatmap pls plyr preprocessCore pROC RColorBrewer RCurl reshape2 scatterplot3d SSPA stringr VennDiagram vsn xcms]; }; metabomxtr = derive2 { name="metabomxtr"; version="1.4.0"; sha256="1zwqz9yl154c3h7qhrmkf2zcvzi2azm1sdkvrpyxg7zjks3bmyz8"; depends=[Biobase Formula multtest optimx plyr]; }; - metagene = derive2 { name="metagene"; version="2.2.0"; sha256="1zq6f5pclxnii9ifdrj3wbl4qffc49bsq13zdp298h4vvq8j9g0s"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges muStat R6 Rsamtools rtracklayer]; }; + metagene = derive2 { name="metagene"; version="2.2.1"; sha256="1l0zfhk4gnm3gvy24igismpb3j3m6vh4mb4q41cfrpkmxn2zlvaq"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges muStat R6 Rsamtools rtracklayer]; }; metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.0.0"; sha256="1lbb505s976j2jxxi7snhd1yahcs0ca9qnicq12b5jmp3ki1br9k"; depends=[Biobase Biostrings dplyr lattice lazyeval magrittr RSQLite ShortRead stringr]; }; metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.12.0"; sha256="0bqxm37ds9a5dibzlxnbdvvqcyzwxxnnw7i6a04g84k885zzxr3a"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; }; metahdep = derive2 { name="metahdep"; version="1.28.0"; sha256="1vl87mc4yl3il9hmsybbwjga610p3lh5717n4csjyaywskqa1ixk"; depends=[]; }; metaseqR = derive2 { name="metaseqR"; version="1.10.0"; sha256="1gy5ywrxqwd8lizbj9lk6qck6zwk670j5y2f0ayz6xvkki4vab97"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; }; methVisual = derive2 { name="methVisual"; version="1.22.0"; sha256="1kcqhlv0lmr7wlkxjl9qqv2676pwna3i4w5xpm4inwgcb892zgjm"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; }; - methyAnalysis = derive2 { name="methyAnalysis"; version="1.12.0"; sha256="1zjg56gr4x5al7j0imcj4689ll59px386pfxg96mv2k8mpqxwq4r"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi rtracklayer VariantAnnotation]; }; + methyAnalysis = derive2 { name="methyAnalysis"; version="1.12.1"; sha256="1fl07k42j292cjr6vgwra84zhwpkaygjr7pqbkiq0abi29ifgw7i"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer VariantAnnotation]; }; methylMnM = derive2 { name="methylMnM"; version="1.8.0"; sha256="1jj6s6pr3hih31n98jsgil3k7n19n5ab4rylfmfnzlbgsdmnw4kq"; depends=[edgeR statmod]; }; - methylPipe = derive2 { name="methylPipe"; version="1.4.3"; sha256="0k3s7yg2hm9nqlq1g2ql2xs1h5aayyvgbh72g9wlz5j36y6h8s3n"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; - methylumi = derive2 { name="methylumi"; version="2.16.0"; sha256="1glp1p7jvnsqarpw92nha6hrrhalh5wm262imwmpbfiik7glp217"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; + methylPipe = derive2 { name="methylPipe"; version="1.4.5"; sha256="013rrdm7nx9m9g0ym0j1cvzrgplw149ivsrfcjfylxdjgwvw61yz"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; + methylumi = derive2 { name="methylumi"; version="2.16.0"; sha256="1glp1p7jvnsqarpw92nha6hrrhalh5wm262imwmpbfiik7glp217"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; mgsa = derive2 { name="mgsa"; version="1.18.0"; sha256="1qdjl9cfyi2fmfm3nlzhp9wdpmvagddvb2cwy6j1pynbx03m55gl"; depends=[gplots]; }; - miRLAB = derive2 { name="miRLAB"; version="1.0.0"; sha256="17yghfwpyiv1hvn47xp5in85p8hfgikrqal8qfd145hsbkj327v7"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; }; + miRLAB = derive2 { name="miRLAB"; version="1.0.1"; sha256="0mkhrzlpf65kc3vwxlc2ckymaziqwxdc0q2rxd77ajdblbccbg59"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; }; miRNApath = derive2 { name="miRNApath"; version="1.30.0"; sha256="0syi2kc6m9zhqaxhzj9h9micnracjj3yfgs8r5zlhs9hdp14jspi"; depends=[]; }; miRNAtap = derive2 { name="miRNAtap"; version="1.4.0"; sha256="04ag91k3xa6gcmlgi2fr00p5247syn856n6jp3fhwhcn5pf5zd8y"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; }; - miRcomp = derive2 { name="miRcomp"; version="1.0.0"; sha256="1a0h7qx7b4ccry5xmgh6fwqandi9lhgnlf0gk1zj6dy9zbkiwhvl"; depends=[Biobase]; }; + miRcomp = derive2 { name="miRcomp"; version="1.0.0"; sha256="1a0h7qx7b4ccry5xmgh6fwqandi9lhgnlf0gk1zj6dy9zbkiwhvl"; depends=[Biobase miRcompData]; }; microRNA = derive2 { name="microRNA"; version="1.28.0"; sha256="14l7fjvapswyk8y690xll3w1yalwl5sqqh8v8xp5xy9qvb3qgiiz"; depends=[Biostrings]; }; minet = derive2 { name="minet"; version="3.28.0"; sha256="16hddd2agqldpfjc4bxa1wm58pczni8b4d8kc09bx2dk5rr4bcg7"; depends=[infotheo]; }; - minfi = derive2 { name="minfi"; version="1.16.0"; sha256="071p7q7chy3d6am8wwlwr4bfhd83xdwm9rjn51k1jrix652aqigh"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; - mirIntegrator = derive2 { name="mirIntegrator"; version="1.0.0"; sha256="004cy2l4li55nd8n4facfk30ndhm1vdxkdsk4zywg14hmn95ldgv"; depends=[AnnotationDbi ggplot2 graph Rgraphviz ROntoTools]; }; - missMethyl = derive2 { name="missMethyl"; version="1.4.0"; sha256="1hbh99ix20909f4mpc3czh8jyj970gi4bj04fcvra6fd8n40w1b4"; depends=[limma methylumi minfi ruv statmod stringr]; }; - mitoODE = derive2 { name="mitoODE"; version="1.8.0"; sha256="1rbxppzwmlrfyzcsa5b0biqm79qyv9662dh16zzp3frz56325kzy"; depends=[KernSmooth MASS minpack_lm]; }; - mmnet = derive2 { name="mmnet"; version="1.8.0"; sha256="1chgsjmvp7kla9f9r740bhpm1s8ickj4pas7f561gil9lbg3k7mc"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; }; - mogsa = derive2 { name="mogsa"; version="1.2.0"; sha256="0w0nh7y9hw0qxyvj51kwj1sp2fwsxi00fw7sbwa0w81baz9zak3v"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; - monocle = derive2 { name="monocle"; version="1.4.0"; sha256="1g1f5a433pq0zdjc9ymgbpdbxvixqjlkdm10vqs6gf4r511a3k76"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 igraph irlba limma matrixStats plyr reshape2 VGAM]; }; + minfi = derive2 { name="minfi"; version="1.16.1"; sha256="0ddqkbgxrfiijz5xzjb566xwvzrwljjhfhylqzhmz8fnrvqydid8"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; }; + mirIntegrator = derive2 { name="mirIntegrator"; version="1.0.0"; sha256="004cy2l4li55nd8n4facfk30ndhm1vdxkdsk4zywg14hmn95ldgv"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; }; + missMethyl = derive2 { name="missMethyl"; version="1.4.0"; sha256="1hbh99ix20909f4mpc3czh8jyj970gi4bj04fcvra6fd8n40w1b4"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; }; + mitoODE = derive2 { name="mitoODE"; version="1.8.0"; sha256="1rbxppzwmlrfyzcsa5b0biqm79qyv9662dh16zzp3frz56325kzy"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; + mmnet = derive2 { name="mmnet"; version="1.8.1"; sha256="0ppcy11xnn593xig8gwz79vsbkdi3f5aai58zdhr59w52y2dafia"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; }; + mogsa = derive2 { name="mogsa"; version="1.2.1"; sha256="07jm5avdhan9mn0pdaq6vhxx7xaibs0sylnc3hfpns84d8rsf65b"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; + monocle = derive2 { name="monocle"; version="1.4.0"; sha256="1g1f5a433pq0zdjc9ymgbpdbxvixqjlkdm10vqs6gf4r511a3k76"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 HSMMSingleCell igraph irlba limma matrixStats plyr reshape2 VGAM]; }; mosaics = derive2 { name="mosaics"; version="2.4.0"; sha256="13vl1grn08qy64971wimmc1j117l7fzxpcwnvaz0j5020m5m8qq7"; depends=[IRanges lattice MASS Rcpp]; }; - motifRG = derive2 { name="motifRG"; version="1.14.0"; sha256="1v9zm5629k2lcqbbgw8bwflvbircyxkfavbkvmbd212kgwcng8vn"; depends=[Biostrings BSgenome IRanges seqLogo XVector]; }; + motifRG = derive2 { name="motifRG"; version="1.14.0"; sha256="1v9zm5629k2lcqbbgw8bwflvbircyxkfavbkvmbd212kgwcng8vn"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; }; motifStack = derive2 { name="motifStack"; version="1.14.0"; sha256="13s1y5xzkaapd53i33f8vdkdl5r4b8jzdyqrydanx35sgwn7fj1c"; depends=[ade4 Biostrings grImport MotIV scales XML]; }; - motifbreakR = derive2 { name="motifbreakR"; version="1.0.1"; sha256="0ybbcy43xmrg4dgf676rybz5irk2sv74lvq6qny6q91am2lrfjwr"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; }; - msa = derive2 { name="msa"; version="1.2.0"; sha256="0mclv8g5vlrgnlxzvam9081z6rvqyxm2zzr2w72mmx6wbz7gp440"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; + motifbreakR = derive2 { name="motifbreakR"; version="1.0.4"; sha256="1mwa070iqvq6qc0igvy5aivnqbipai1grccf1vz80al44pfx1w2v"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; }; + msa = derive2 { name="msa"; version="1.2.1"; sha256="0lj5x3zh5vp6j9s3h77iq0awy9v5n453hbqf3k8pasj6l5x0dmyj"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; }; msmsEDA = derive2 { name="msmsEDA"; version="1.8.0"; sha256="0y9k03mpq5i6sa8dngadgcxi02ggka7n1rz54mll012gs6fzvyra"; depends=[gplots MASS MSnbase RColorBrewer]; }; msmsTests = derive2 { name="msmsTests"; version="1.8.0"; sha256="1qkg7rhvfgpkq8v1avwffqc2v6afijwzw1myd17llmj6z8iyhy6j"; depends=[edgeR msmsEDA MSnbase qvalue]; }; multiscan = derive2 { name="multiscan"; version="1.30.0"; sha256="0nl1pjg1x1rdfhn09c9nk96swsw3gph7bnd1lfj87024b4w1r50p"; depends=[Biobase]; }; multtest = derive2 { name="multtest"; version="2.26.0"; sha256="1gpq2adj177fn8xf7gpiiq8khmcln90xif413j1fzpwjmjpzpb1v"; depends=[Biobase BiocGenerics MASS survival]; }; muscle = derive2 { name="muscle"; version="3.12.0"; sha256="1bcyi2n1mpnp7b54lxj8g03rbjrawyr3isn211rb5m7r8jzpdvyw"; depends=[Biostrings]; }; - mvGST = derive2 { name="mvGST"; version="1.4.0"; sha256="1yi8558lkqfrmxgighb5v8q12gwqlbs2ds610fgf8ggrdn84bzq8"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; }; + mvGST = derive2 { name="mvGST"; version="1.4.0"; sha256="1yi8558lkqfrmxgighb5v8q12gwqlbs2ds610fgf8ggrdn84bzq8"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; }; mygene = derive2 { name="mygene"; version="1.6.0"; sha256="0przfr6y9svkj9dbih43hpi69wzs07r15q7w233pnmm2qhxylkf4"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; myvariant = derive2 { name="myvariant"; version="1.0.1"; sha256="1xby50zw1250nvqbki1xccjcri8qz286mdzrm3fzfv63i8g4xwjq"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; }; mzID = derive2 { name="mzID"; version="1.8.0"; sha256="1250kd8lrl4hnh8mvbl5hqbcszg3nynssdvjmy12wf0y0r9gjm8x"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; - mzR = derive2 { name="mzR"; version="2.4.0"; sha256="1k6skks773q7im793j1sszvzhfjcsf34yw7g8z2qd2pbp0l1k28z"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; - ncdfFlow = derive2 { name="ncdfFlow"; version="2.16.0"; sha256="1nyr6jzngm4q5kaq73xx70nfv69d4fimv6mr6ldbykz59ip0rg33"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; }; + mzR = derive2 { name="mzR"; version="2.4.1"; sha256="189dsr69p0yxqm9lwhqxd9i24f45hqywp8ncx535znv2dhs8v1rw"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; + ncdfFlow = derive2 { name="ncdfFlow"; version="2.16.1"; sha256="0r968wix53rwwqx60gl04a46c1pwfydi80gixbx147zv8lxmc5cx"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; }; neaGUI = derive2 { name="neaGUI"; version="1.8.0"; sha256="1xms5k8zzbk31sj0f92rsqjv40vcqy89pmy8z3j0336iascqbx9l"; depends=[hwriter]; }; nem = derive2 { name="nem"; version="2.44.0"; sha256="1bkq622jyrfn0v4wyw5ycxmri8kyils4wznsz26ki3awff34lq3h"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; - netbenchmark = derive2 { name="netbenchmark"; version="1.2.0"; sha256="10s8xsisjp9sj9dl67bgn94ipm6a6kpqli3pvjdpxkmvjkg400kg"; depends=[c3net corpcor fdrtool GeneNet Matrix minet PCIT pracma randomForest Rcpp]; }; + netbenchmark = derive2 { name="netbenchmark"; version="1.2.0"; sha256="10s8xsisjp9sj9dl67bgn94ipm6a6kpqli3pvjdpxkmvjkg400kg"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; }; netbiov = derive2 { name="netbiov"; version="1.4.0"; sha256="1h3986kfi516xlw675cq901ls9v7rj5rr0ls5lny21wd439n2avf"; depends=[igraph]; }; nethet = derive2 { name="nethet"; version="1.2.0"; sha256="1p214bgjccigsvqcr0kv0ckv00zvkkpk2pfh9xvcb4kp6biqs94j"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; - netresponse = derive2 { name="netresponse"; version="1.20.0"; sha256="0m1cf42a66jk0qbgz6xc82bfwd1vnk6p15kaahcrf8z1z0j2xj6q"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape Rgraphviz]; }; + netresponse = derive2 { name="netresponse"; version="1.20.15"; sha256="1mh3b5gjyh6nqif9qc45yy703vi4a4hi0szl6y6aazxd6fjqy98s"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; }; networkBMA = derive2 { name="networkBMA"; version="1.12.0"; sha256="0zkf10iqiabsln1jxq0sypr43mrw6k82l3pdp5bg9kcv0bqqqy5k"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; }; nnNorm = derive2 { name="nnNorm"; version="2.34.0"; sha256="1wb85z0r0rwgaf1yzzlj1pcbgclz2isz9whxsify9jx8gfqflanh"; depends=[marray nnet]; }; nondetects = derive2 { name="nondetects"; version="2.0.0"; sha256="0cyp7f90w9vcgwkg0mxrrpv28wihsgbynhq5kjk5hng9qfqjcyxg"; depends=[Biobase HTqPCR limma mvtnorm]; }; @@ -922,36 +922,36 @@ in with self; { nucleR = derive2 { name="nucleR"; version="2.2.0"; sha256="0zhflv4nkn9dc2bdl81j9mjww6nh1mj6ffffy9cywvxzgpp2lc50"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; nudge = derive2 { name="nudge"; version="1.36.0"; sha256="1px6hnda7hp7yx9imkl8xq8m772csd2qic0kq5bqwshk5qdvfhw7"; depends=[]; }; occugene = derive2 { name="occugene"; version="1.30.0"; sha256="0p6pk7v75b4pbyxs1pglbsfprk4yi854d8aw41a1lwbmaphx5yyc"; depends=[]; }; - oligo = derive2 { name="oligo"; version="1.34.0"; sha256="1bdkdflp2a2s4n552z44hqqin621aych0l1pcn3w0f36bxdy55g4"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; + oligo = derive2 { name="oligo"; version="1.34.2"; sha256="0cv0vl8cj9n3la6n55qqlncyaxv072n6sdx8gp65prm6myp3ycgw"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; }; oligoClasses = derive2 { name="oligoClasses"; version="1.32.0"; sha256="0gm4z4pa1hyrd9bdzncmkfhfywp3622wnyvhayhw7h17dw4gw94j"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; }; omicade4 = derive2 { name="omicade4"; version="1.10.0"; sha256="1ay1jm0r8qyr9271l1aqnvm800pagd3j21m37qlv6xfjvv4j6w5f"; depends=[ade4 made4]; }; oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.36.0"; sha256="0r5y531y4niy9gh64n7nk8a0xcj8lyg36axhcjx116ycsqa00x5h"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; }; ontoCAT = derive2 { name="ontoCAT"; version="1.22.0"; sha256="03vy4210m31jzhhhbhw3ixhm1lji4qil2zp0ckmyh3xb8m8s8fzl"; depends=[rJava]; }; - openCyto = derive2 { name="openCyto"; version="1.8.2"; sha256="1kgns98jzamdpib6mjbdz6r5ixjjap95skvckp2z2mcwfirbi24m"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; + openCyto = derive2 { name="openCyto"; version="1.8.4"; sha256="1g23qia1ah2rjvz6clc9jfpb1sql2g1298bd8lard293ryvwpnhv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; oposSOM = derive2 { name="oposSOM"; version="1.6.0"; sha256="0wdh40477hn2875j0q4nj0l0h210jym4j642lkjlx8zvdx9jra29"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; }; - pRoloc = derive2 { name="pRoloc"; version="1.10.0"; sha256="1xklrd0f2gw60kd2zlynfgl9aj2wpfbphcrancsd28r3b5fq9xa4"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; - pRolocGUI = derive2 { name="pRolocGUI"; version="1.4.0"; sha256="04z5xwzkf16lflacshk1gxrj1vsakk85yr8v261bfy0g1cy8hqi2"; depends=[DT MSnbase pRoloc scales shiny]; }; + pRoloc = derive2 { name="pRoloc"; version="1.10.1"; sha256="1k9249g46gf6ar3q44zrg8v1lqxl81rljmn0c107rxck0rvdwaxn"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; }; + pRolocGUI = derive2 { name="pRolocGUI"; version="1.4.1"; sha256="14wmmhrdm5fgw8smxgdadd49ggaqnnqw7p65xn0kkj6yk87h3xrx"; depends=[DT MSnbase pRoloc pRolocdata scales shiny]; }; paircompviz = derive2 { name="paircompviz"; version="1.8.0"; sha256="0q5saqpyfjx37d6l6vqfiws8n4axarfvb1qr010a3davhdz4kzn8"; depends=[Rgraphviz]; }; pandaR = derive2 { name="pandaR"; version="1.2.0"; sha256="00wkzhkghzy04pg5qxgd2gmcmqgri20vgw8m08yfdymb918zgvyk"; depends=[igraph matrixStats]; }; panp = derive2 { name="panp"; version="1.40.0"; sha256="0fmi5j7xr2720548k36njjk4ad4szma3zbqig4ghd1x2gg94wh7n"; depends=[affy Biobase]; }; parglms = derive2 { name="parglms"; version="1.2.0"; sha256="1n1q838gv45daji04a0m0wc92a3xwhgf4asl7wbirk198ra3q7pj"; depends=[BatchJobs BiocGenerics doParallel foreach]; }; parody = derive2 { name="parody"; version="1.28.0"; sha256="1srs2qyp7lwq9w19izszg3n9q0mlj634zlksb796v7608yp0y643"; depends=[]; }; - pathRender = derive2 { name="pathRender"; version="1.38.0"; sha256="0bc9xy1hka79bq0zw1faalsl89aibf7d77i7gv9jnmh66li9g1pa"; depends=[AnnotationDbi graph RColorBrewer Rgraphviz]; }; - pathVar = derive2 { name="pathVar"; version="1.0.0"; sha256="04f1v26rxz9nf660bs6jql33cls41jlf45w7pcqa5xnp15gjhybv"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; + pathRender = derive2 { name="pathRender"; version="1.38.0"; sha256="0bc9xy1hka79bq0zw1faalsl89aibf7d77i7gv9jnmh66li9g1pa"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; }; + pathVar = derive2 { name="pathVar"; version="1.0.1"; sha256="1ixraifr8d86m9rdg38d6kfzmgghjxasgi3abb1i8knjyfwrc05v"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; }; pathifier = derive2 { name="pathifier"; version="1.8.0"; sha256="08ipv1xcmxdb9g8h4dh4c7icwfp4myd9gwacb3cbl48libl459wj"; depends=[princurve R_oo]; }; - pathview = derive2 { name="pathview"; version="1.10.1"; sha256="0mpr9fqfp3ar927m6rvghn6ggbxp2ll2a9jfrz9ic44mbwpa1lb1"; depends=[AnnotationDbi graph KEGGgraph KEGGREST png Rgraphviz XML]; }; - paxtoolsr = derive2 { name="paxtoolsr"; version="1.4.0"; sha256="0qrly2fxznbdzzm6j4jdrjx5wnnnvgvsi7ni7xd5x68a21klhw9f"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; }; + pathview = derive2 { name="pathview"; version="1.10.1"; sha256="0mpr9fqfp3ar927m6rvghn6ggbxp2ll2a9jfrz9ic44mbwpa1lb1"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; }; + paxtoolsr = derive2 { name="paxtoolsr"; version="1.4.6"; sha256="170gm5qxlsz2dv249q16shpj0xm9y7rp3rpn9ij6r2c5d3xn8i21"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; }; pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.14.0"; sha256="1w0cpakxlm8dx6z3j844xmkz3dawiaschrjcjlkqjv9ay8vfkhz8"; depends=[AnnotationDbi Biostrings ellipse]; }; pcaMethods = derive2 { name="pcaMethods"; version="1.60.0"; sha256="090bgl178zxj89d0kshwl5jkz8qszgdbwrfdbbawg8ka48bilw2l"; depends=[Biobase BiocGenerics MASS Rcpp]; }; pcot2 = derive2 { name="pcot2"; version="1.38.0"; sha256="1ycsbry5srf1msq4vcvv0q34lgzkwadh7k1pgwv963i567i4lx3b"; depends=[amap Biobase]; }; - pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.34.0"; sha256="1p65xxfnkck88bn1qq43yy0gh11wcb8cifhbj8h5sm2i4miysf25"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pdmclass = derive2 { name="pdmclass"; version="1.42.0"; sha256="1f4zrxbyk49hm0cxp0g1786cwc7g1k5z6v3hn2z66m7rbapz8afy"; depends=[Biobase mda]; }; + pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.34.1"; sha256="0dp1723hfkx0pc76b5xglqkxgvsh2iqqmx3sy9kyv7qcqgida14r"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pdmclass = derive2 { name="pdmclass"; version="1.42.0"; sha256="1f4zrxbyk49hm0cxp0g1786cwc7g1k5z6v3hn2z66m7rbapz8afy"; depends=[Biobase fibroEset mda]; }; pepStat = derive2 { name="pepStat"; version="1.4.0"; sha256="0ys8nq2f5ajir4k8gdm02p26vzbhhk88ys8zc7zsqim3v4pxgdis"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; pepXMLTab = derive2 { name="pepXMLTab"; version="1.4.0"; sha256="1fgq8x6c3lml12a92ihrkkvaph1xh90i01h15k42aadh3725a5nw"; depends=[XML]; }; phenoDist = derive2 { name="phenoDist"; version="1.18.0"; sha256="0kjsdgvr5kmrnn7mjzphk5r6irgjv5cfgmrd4yddprbmmln39avn"; depends=[e1071 imageHTS]; }; - phenoTest = derive2 { name="phenoTest"; version="1.18.0"; sha256="1lgxacph4mv0z8c17lx4f82nvq151ggsfv5f9p35aw9z1pc10pwg"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; + phenoTest = derive2 { name="phenoTest"; version="1.18.0"; sha256="1lgxacph4mv0z8c17lx4f82nvq151ggsfv5f9p35aw9z1pc10pwg"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; phyloseq = derive2 { name="phyloseq"; version="1.14.0"; sha256="0h34ac577d2lzh6rzbvwz04ngp3v4c728z0nzf646ab10nfk1i17"; depends=[ade4 ape Biobase BiocGenerics biom Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; - piano = derive2 { name="piano"; version="1.10.1"; sha256="0z9vwaj0kkbyqra2h63hb07n8sxzscp6mp0krgrjn6kd7h75lx35"; depends=[Biobase BiocGenerics gplots igraph marray relations]; }; + piano = derive2 { name="piano"; version="1.10.2"; sha256="01ql6x020ai8aj6x89bsxixvv4q4fxsnyv87kxaw4p1hxcxqvybp"; depends=[Biobase BiocGenerics gplots igraph marray relations]; }; pickgene = derive2 { name="pickgene"; version="1.42.0"; sha256="1awm471s2mx4w7m2p2bdz67rbgyz0khsa85bbrjcb4lbvljqwdv7"; depends=[MASS]; }; pint = derive2 { name="pint"; version="1.20.0"; sha256="19q21b3zdn4adx49zn88z69xz3mqza58xdhig3zicn9s0g21bfz4"; depends=[dmt Matrix mvtnorm]; }; pkgDepTools = derive2 { name="pkgDepTools"; version="1.36.0"; sha256="1v2fsax49wklwdmgxp9pjyp18cbj2rsg7yd68mwr2amlihgvmsp1"; depends=[graph RBGL]; }; @@ -964,12 +964,12 @@ in with self; { pmm = derive2 { name="pmm"; version="1.2.0"; sha256="1rsyh05w32gk2sip9hx1q93hwqwb1kmns47aq8qj2dw26ii0is3c"; depends=[lme4]; }; podkat = derive2 { name="podkat"; version="1.2.0"; sha256="168piyx6c6vif771adm4594h6dq2h14g3jfk8lj2fvvdwyms2dn8"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; }; polyester = derive2 { name="polyester"; version="1.6.0"; sha256="0if2rbgbfc3ghz5mnmpmpv6rq63qjm3l16gmlr493vfrpxdzclnv"; depends=[Biostrings IRanges limma logspline S4Vectors]; }; - ppiStats = derive2 { name="ppiStats"; version="1.36.0"; sha256="1s5xv565w924g71qaxgmhfszrkqs3arzi8l0vzcz446r2pgm6d32"; depends=[Biobase Category graph lattice RColorBrewer ScISI]; }; + ppiStats = derive2 { name="ppiStats"; version="1.36.0"; sha256="1s5xv565w924g71qaxgmhfszrkqs3arzi8l0vzcz446r2pgm6d32"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; }; prada = derive2 { name="prada"; version="1.46.0"; sha256="0ak21586bbkbpwji1pcbr44dlwyhslscrqm2y172310xbxm0sqbg"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; }; prebs = derive2 { name="prebs"; version="1.10.0"; sha256="06rbsza5gdv9k9hcaxx0k65p9w61kfxiw0p4ah23dqfx0mldh5nx"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; predictionet = derive2 { name="predictionet"; version="1.16.0"; sha256="1q7nl11kvh2rl5rzb4qnq5ckdrdkna0arfnjmki35lr8hyh65id0"; depends=[catnet igraph MASS penalized RBGL]; }; preprocessCore = derive2 { name="preprocessCore"; version="1.32.0"; sha256="07isghjkqm91rg37l1fzpjrbq36b7w4pbsi95wwh6a8qq7r69z1n"; depends=[]; }; - proBAMr = derive2 { name="proBAMr"; version="1.4.0"; sha256="0501sg8vix8s2d3mrqr2kdscy0znr0zh9lzy8hvv4yjhz6qyzj8y"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; + proBAMr = derive2 { name="proBAMr"; version="1.4.1"; sha256="1lk3jq113hpx315kmq0s9ll1m7x1s91gwdzm3db06509wp5ki881"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; }; procoil = derive2 { name="procoil"; version="1.20.0"; sha256="11ss88jfk1j2b29l43qlvrlmhgxlfv1dw8wd9sqy3z3figspr3wz"; depends=[]; }; prot2D = derive2 { name="prot2D"; version="1.8.0"; sha256="0pmsl550wvxnqx5zbj8b6lhvlb2bcmvi3xxx66x8r1sz3cdy3l7h"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; proteinProfiles = derive2 { name="proteinProfiles"; version="1.10.0"; sha256="0hkimlq3v8hq3khinydm4m8v5fgld74vc6yg9yzhz71hv1yy2i2m"; depends=[]; }; @@ -980,15 +980,15 @@ in with self; { pwOmics = derive2 { name="pwOmics"; version="1.2.0"; sha256="0vlr71mhch716xl2i0366pxjkawci0g2imvfhsqinv5gd92m6hpq"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; }; qcmetrics = derive2 { name="qcmetrics"; version="1.8.0"; sha256="0y5bi4162b93d02ksg1hpqlfx4inl6bmal84lhrrzra5k6zzv72m"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; }; qpcrNorm = derive2 { name="qpcrNorm"; version="1.28.0"; sha256="0ywh6iq1bywcyw5v6iax1ngigii3s7d0f6gfj2xk9qwfxpavzjjf"; depends=[affy Biobase limma]; }; - qpgraph = derive2 { name="qpgraph"; version="2.4.0"; sha256="10gwnylvaknj26l3whcap3sh7jfkhfr1lm337ckhs667n5cl8ph7"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; + qpgraph = derive2 { name="qpgraph"; version="2.4.2"; sha256="0np8d7rw182zncyxcvn0sq0linl7aqy1aw2yysb5w29g8cgd8m82"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; qrqc = derive2 { name="qrqc"; version="1.24.0"; sha256="0850frx6fg9py2laav0yqavl9ckbn6y475xm9r6gxvyzp63smzdg"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; }; quantro = derive2 { name="quantro"; version="1.4.0"; sha256="1vkm12h5b85h0db2sxv3c8hhxmgpdycllxr6d9zv2y4an1zhjkn5"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; }; quantsmooth = derive2 { name="quantsmooth"; version="1.36.0"; sha256="0gfqvx6djy0sl0dz1la19wzc6nfbazrw28wrpf1b934gfbjii25d"; depends=[quantreg]; }; - qusage = derive2 { name="qusage"; version="2.2.0"; sha256="1d30m6c60viwvgk5v4234zapnzx58m6jcsfkp2kag5n9gfy3mwlw"; depends=[Biobase limma lsmeans nlme]; }; - qvalue = derive2 { name="qvalue"; version="2.2.0"; sha256="0fg4vz8jwv8yy7f3yb31s17hp6aj38gqkg4970qxp98cmm2zgasd"; depends=[ggplot2 reshape2]; }; + qusage = derive2 { name="qusage"; version="2.2.2"; sha256="1pc9n8nfxgdc5xw3jhpvv05yijwwk2f9i7ssjxwgnc8mczrzv8b9"; depends=[Biobase limma lsmeans nlme]; }; + qvalue = derive2 { name="qvalue"; version="2.2.2"; sha256="0zfip08aacy80cc6xx04789k46nghzdxj8dbsgixvvhwhg2vxy1n"; depends=[ggplot2 reshape2]; }; r3Cseq = derive2 { name="r3Cseq"; version="1.16.0"; sha256="0zjxqmj1lblxcl73cisacjacdmw9aj4wvr5lxdn9b4kq6rcr7ljn"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; }; rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.8.0"; sha256="1akmgiqgi53d1264mmhkizn0g1fvjvqdgzsrw9yx26xi9ysmq9kg"; depends=[data_table XML]; }; - rCGH = derive2 { name="rCGH"; version="1.0.2"; sha256="07mbhgyjjmlyv0237gccd04hjxf22qw7nx5g71ijxj4mb22igign"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust plyr shiny]; }; + rCGH = derive2 { name="rCGH"; version="1.0.2"; sha256="07mbhgyjjmlyv0237gccd04hjxf22qw7nx5g71ijxj4mb22igign"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg19_knownGene]; }; rGADEM = derive2 { name="rGADEM"; version="2.18.0"; sha256="1aib9qqvbq9myyngxlmv494i7pr96k4p9rmrnc4drxa9zhh0pp5a"; depends=[Biostrings BSgenome IRanges seqLogo]; }; rGREAT = derive2 { name="rGREAT"; version="1.2.0"; sha256="00gjlsgz3mac48qdpgxk0vvn5z454m2lcxm6lha8jby73pls9hh3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; }; rHVDM = derive2 { name="rHVDM"; version="1.36.0"; sha256="0k1gccnac59q54y2nypzgip2srs5yg3v2hhrz86ps50p2lx4pqd2"; depends=[affy Biobase minpack_lm R2HTML]; }; @@ -996,29 +996,29 @@ in with self; { rRDP = derive2 { name="rRDP"; version="1.4.0"; sha256="101g3j8r8h0nc69k0srlwkxld4qd99ww8xf5b34sm015hvhfx55k"; depends=[Biostrings]; }; rSFFreader = derive2 { name="rSFFreader"; version="0.18.0"; sha256="0z2lkjbs3svx1b9zr4smjwrcd9xzxhfp98428vzaqq0k79h1v666"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; }; rTANDEM = derive2 { name="rTANDEM"; version="1.10.0"; sha256="1dmaqdjfmjkkrddf666hpp95s7s6x0ssinx9aybl6952ylfjgcd1"; depends=[data_table Rcpp XML]; }; - rTRM = derive2 { name="rTRM"; version="1.8.0"; sha256="1k36p601n1f2bkkyfh6sr4x32ikd4jsr99ad3rbkmx04slkdzkka"; depends=[AnnotationDbi DBI igraph RSQLite]; }; - rTRMui = derive2 { name="rTRMui"; version="1.8.0"; sha256="1mbljb86k3vhiavcv4fvibj6fykg65p4nh7wrrm1nxz90k5hbznp"; depends=[MotifDb rTRM shiny]; }; + rTRM = derive2 { name="rTRM"; version="1.8.1"; sha256="0hy2wxlclbgw48gizm6l2c65x81s17qh4l7751h00yw0995l4dsq"; depends=[AnnotationDbi DBI igraph RSQLite]; }; + rTRMui = derive2 { name="rTRMui"; version="1.8.0"; sha256="1mbljb86k3vhiavcv4fvibj6fykg65p4nh7wrrm1nxz90k5hbznp"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; }; rain = derive2 { name="rain"; version="1.4.0"; sha256="0nldnsy6x91nv3i24gj81yxmrr7d4j7iicqxy279gh1k5zh5l5r1"; depends=[gmp multtest]; }; rama = derive2 { name="rama"; version="1.44.0"; sha256="0nka6a2dk7jn4lk0i2p91hxwdgpny6y3j4dz709crrxlz3xjqflm"; depends=[]; }; randPack = derive2 { name="randPack"; version="1.16.0"; sha256="1i7rr4pid1yw5fjjlwcd0zy46z3c351vxqsj2z8mycl8cm29n8zn"; depends=[Biobase]; }; rbsurv = derive2 { name="rbsurv"; version="2.28.0"; sha256="0pz7rza3j7yrdjp1q35y7xxhmkq9cvfg4ippgqqkny8qyayhy7bm"; depends=[Biobase survival]; }; - rcellminer = derive2 { name="rcellminer"; version="1.2.1"; sha256="0bm4w0nng4bqvz3lrfgvws5pl89k5y2ghll97ndwpccszbjsll79"; depends=[Biobase fingerprint gplots rcdk shiny stringr]; }; + rcellminer = derive2 { name="rcellminer"; version="1.2.3"; sha256="1z91vk4bks47z2mypg8lg2qqxqwyggp7jykv7xl92msarqnz4izc"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; }; reb = derive2 { name="reb"; version="1.48.0"; sha256="1bxijf91vdr6088459r29kvy691bjbscy170pc0739iqbg7z80zm"; depends=[Biobase idiogram]; }; regionReport = derive2 { name="regionReport"; version="1.4.1"; sha256="1sh6m6ly2r3lxvx6q6rb05ygd4c5ab7lzh4j6hpy5va3mg7prrgr"; depends=[bumphunter derfinder derfinderPlot devtools GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges knitcitations knitr knitrBootstrap mgcv RColorBrewer rmarkdown whisker]; }; - regioneR = derive2 { name="regioneR"; version="1.2.0"; sha256="13va8d8dny22b5y8c9k7s6jps5b77h7kp7l5gx2ci0hhijr2xbx5"; depends=[BSgenome GenomicRanges memoise rtracklayer]; }; + regioneR = derive2 { name="regioneR"; version="1.2.3"; sha256="0sf2j51ibmv38v19wg4anawwnini442hd30k7yvi3byqhs598jpn"; depends=[BSgenome GenomicRanges memoise rtracklayer]; }; rfPred = derive2 { name="rfPred"; version="1.8.0"; sha256="09sc9y6pyw96piaqh33rzf94ryclknbhqig1fp36d3zabfj8a91i"; depends=[data_table GenomicRanges IRanges Rsamtools]; }; - rgsepd = derive2 { name="rgsepd"; version="1.2.0"; sha256="0djx0fm44fj6k8dq4ysqag93icnymm2b38asgplds8y6fv9gp39b"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges goseq gplots hash]; }; + rgsepd = derive2 { name="rgsepd"; version="1.2.0"; sha256="0djx0fm44fj6k8dq4ysqag93icnymm2b38asgplds8y6fv9gp39b"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges GO_db goseq gplots hash org_Hs_eg_db]; }; rhdf5 = derive2 { name="rhdf5"; version="2.14.0"; sha256="0cxg8w3244gcifvc27dm85wip776x5lnwkl7qhc7w92if57z7wcp"; depends=[zlibbioc]; }; riboSeqR = derive2 { name="riboSeqR"; version="1.4.0"; sha256="1i9p9hxh2sipgpa1wf59pfs3h0qprr473axlvzw7f0yx171qimfg"; depends=[abind GenomicRanges]; }; rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.28.0"; sha256="0mfcy7l31g5z5yv12sv9imaf19p9vawnk7cqcm50x2sm032r8n7f"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; }; - rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.0.0"; sha256="196nh21ypidvxkjjjmz13qf0b735pdf3avdxlqp72adx221kr729"; depends=[RColorBrewer]; }; - roar = derive2 { name="roar"; version="1.6.0"; sha256="1qpdfv40dbc4fpp3f2bfqg9gsi8bc9d3jp937im88ywcwb1v0b32"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; - rols = derive2 { name="rols"; version="1.12.0"; sha256="14b540wva9w3fdjas4q4kmz2isb218mm2lk02v95ads2y5isnacf"; depends=[Biobase XML]; }; - ropls = derive2 { name="ropls"; version="1.2.4"; sha256="1j6ah7b0n2yvdx0c5dcxnncl1r20ajcnx2046y2v1gg4qpma9a5r"; depends=[]; }; + rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.0.2"; sha256="0m22q75fyzwyxn6s58sjyzqyzp5rb808fvvck8vljnqghcflbybc"; depends=[RColorBrewer]; }; + roar = derive2 { name="roar"; version="1.6.1"; sha256="13730bs9k37brga57yy24m2q323i1676qlk7fnlg8c6hm151bq2q"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; + rols = derive2 { name="rols"; version="1.12.2"; sha256="0bfgd346kxbb4wkhnhfpgkv33fm7p63pldvjj28sxal88g14n22r"; depends=[Biobase XML]; }; + ropls = derive2 { name="ropls"; version="1.2.14"; sha256="1b6k2c9i263m83jhvhcv65daa1gjyrra5hvmm9fm26h829g16y4l"; depends=[]; }; rpx = derive2 { name="rpx"; version="1.6.0"; sha256="04kd9kn7k8fswpy03ccbaq6glwxiilvklyygj9gmi2sam06q9d6i"; depends=[RCurl XML]; }; rqubic = derive2 { name="rqubic"; version="1.16.0"; sha256="0gasrkxpbvhxig6n3k3n9hdid9cg4gnkffyi9xn2zl33zm8wyirf"; depends=[biclust Biobase BiocGenerics]; }; rsbml = derive2 { name="rsbml"; version="2.28.0"; sha256="0fzn7vpfsfb3k0j6mid0prrgdaqsv8b3945d0ynls8jgp02ma6hs"; depends=[BiocGenerics graph]; }; - rtracklayer = derive2 { name="rtracklayer"; version="1.30.1"; sha256="1if31hg56islx5vwydpgs5gkyas26kyvv2ljv1c7jikpm62w14qv"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; + rtracklayer = derive2 { name="rtracklayer"; version="1.30.3"; sha256="0b1zkan1qv07bhbwrgsggg2zscqvrngi3j072pqfj1804b308xv4"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; }; sRAP = derive2 { name="sRAP"; version="1.10.0"; sha256="080s88l3a2fbgqnc8sy41kwzkm6skjazkirqini7n6xqcsqb9lih"; depends=[gplots pls qvalue ROCR WriteXLS]; }; sSeq = derive2 { name="sSeq"; version="1.8.0"; sha256="1l05qm3576fx9v5bxvc0xm4916bzfvh1f4nnjdm67z82qxbx4wnz"; depends=[caTools RColorBrewer]; }; safe = derive2 { name="safe"; version="3.10.0"; sha256="17ryzq2rc8hdmj1kzv62kzh1pn2nb454d73mdd5dk6qy0pgg4fan"; depends=[AnnotationDbi Biobase SparseM]; }; @@ -1030,14 +1030,14 @@ in with self; { sbgr = derive2 { name="sbgr"; version="1.0.0"; sha256="0bvvxd0c4k4mmwkcb9w02i2kb6vwlq84w8vfqiamnwjy2vgjgka9"; depends=[httr jsonlite objectProperties]; }; scsR = derive2 { name="scsR"; version="1.6.0"; sha256="0g1vgx8wrdwbhlzmf0a11fg5jnbkvz402h8qj48vj4bq8j202bc1"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; }; segmentSeq = derive2 { name="segmentSeq"; version="2.4.0"; sha256="0dbw8kssi2l6mnvjh7skbxc0akyha2wpa0r6ixw73p4g5qbaqafn"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; }; - seq2pathway = derive2 { name="seq2pathway"; version="1.2.0"; sha256="1xki7wsydgagsh3fx9gwdd2asrbm6q9gnh27bv2cyrmjpp0nkjg1"; depends=[biomaRt GenomicRanges GSA nnet WGCNA]; }; - seqCNA = derive2 { name="seqCNA"; version="1.16.0"; sha256="1wq92wszv0x99l52lm3k0zc2ffin1sp78xlyfabxpwi1v0yrkifl"; depends=[adehabitatLT doSNOW GLAD]; }; + seq2pathway = derive2 { name="seq2pathway"; version="1.2.0"; sha256="1xki7wsydgagsh3fx9gwdd2asrbm6q9gnh27bv2cyrmjpp0nkjg1"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; + seqCNA = derive2 { name="seqCNA"; version="1.16.0"; sha256="1wq92wszv0x99l52lm3k0zc2ffin1sp78xlyfabxpwi1v0yrkifl"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; seqLogo = derive2 { name="seqLogo"; version="1.36.0"; sha256="0kn1a1nf2j4v9c09vjkz9bmxlln7yhg87bnyrdsxy1m55x56rn5k"; depends=[]; }; seqPattern = derive2 { name="seqPattern"; version="1.2.0"; sha256="0p9zj6bic7sa0hb2bjm988kkk5n9r1kvlbqkzvy702f642n0j53i"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; - seqTools = derive2 { name="seqTools"; version="1.4.0"; sha256="1jwxy9n14b1sdlnjz3242m8rp04kaq0pkyp65xl7w2dw5qm3a81c"; depends=[zlibbioc]; }; + seqTools = derive2 { name="seqTools"; version="1.4.1"; sha256="19hxakskh3qa9ypp2nmly3mrlbjfrq2ya5f5gyhg4mv0vahm9yc8"; depends=[zlibbioc]; }; seqbias = derive2 { name="seqbias"; version="1.18.0"; sha256="1wwskcbl3wd8gl63jl4wl0xwzj8kbwbc8xhp12z3xximngkk7dgd"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; }; seqplots = derive2 { name="seqplots"; version="1.8.0"; sha256="1kk914pc462n37gmma6l1d0kcrw2qqgkd3sb67mrx053h1n0lz35"; depends=[Biostrings BSgenome Cairo class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; }; - shinyMethyl = derive2 { name="shinyMethyl"; version="1.4.0"; sha256="1db4g2sgfgr21hh3xcpv8lcnmrqgwfrj97dlpi8blqcs81mrhc3s"; depends=[BiocGenerics matrixStats minfi RColorBrewer shiny]; }; + shinyMethyl = derive2 { name="shinyMethyl"; version="1.4.0"; sha256="1db4g2sgfgr21hh3xcpv8lcnmrqgwfrj97dlpi8blqcs81mrhc3s"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.8.0"; sha256="0dkgwfynznpq2q55d83w4x0nmal3dkgzxi1jpdcsasqlhsyqvmvx"; depends=[mixtools rTANDEM shiny xtable]; }; sigPathway = derive2 { name="sigPathway"; version="1.38.0"; sha256="126cyw88d6rxp3bzdqsmm2v0kvhn650qmi4zcs9v50n0hhwyrxrf"; depends=[]; }; sigaR = derive2 { name="sigaR"; version="1.14.0"; sha256="07ip468liyg9b6q9izd1wdp29p9f2icfs01nf0il4gc76h6d0rr5"; depends=[Biobase CGHbase corpcor igraph marray MASS mvtnorm penalized quadprog snowfall]; }; @@ -1048,17 +1048,17 @@ in with self; { simulatorZ = derive2 { name="simulatorZ"; version="1.4.0"; sha256="1sypvrwq6ay7lzmb9cmpix1zgzafzryvf4my5jky846bcpam91qj"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; }; sincell = derive2 { name="sincell"; version="1.2.0"; sha256="1qmjy9cwhnyg4s3jfzi0z0yfdza4dma0q6h73772mhh2l4q149h7"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; sizepower = derive2 { name="sizepower"; version="1.40.0"; sha256="0wl1fvldarg85gg4i6xmh2ssma2hdqddd3lp7x13r2322344gmxl"; depends=[]; }; - skewr = derive2 { name="skewr"; version="1.2.0"; sha256="0kmlgv1j104dnlbvg00jsbcdhr60l83dabfrzggvx7s9aspwgp30"; depends=[IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; }; + skewr = derive2 { name="skewr"; version="1.2.0"; sha256="0kmlgv1j104dnlbvg00jsbcdhr60l83dabfrzggvx7s9aspwgp30"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; }; snapCGH = derive2 { name="snapCGH"; version="1.40.0"; sha256="0fjqp0qhwk041pgwqp3av5ihkf4xb9li6zy6gmvk24hlj8sm600z"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; }; snm = derive2 { name="snm"; version="1.18.0"; sha256="150lwwk6cyhwjypb4f3gsmhpiv4vcayip7gpl2vxfmvhg03yqbyl"; depends=[corpcor lme4]; }; snpStats = derive2 { name="snpStats"; version="1.20.0"; sha256="16j3qq9vqswgra5xkm1ykwzcf8gxy7f7xa0l0z08n36hv7d0zd6x"; depends=[BiocGenerics Matrix survival zlibbioc]; }; soGGi = derive2 { name="soGGi"; version="1.2.1"; sha256="11ksx2z9vkz1d39fhds7cadwr0mzicis5nizj6qyzmzlybyc8v72"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; - spade = derive2 { name="spade"; version="1.18.0"; sha256="0k2drcv7dnrnair6gnsgfayajanzc6bq8a9s1rg1faihfqqrh0s2"; depends=[Biobase flowCore igraph Rclusterpp]; }; + spade = derive2 { name="spade"; version="1.18.2"; sha256="0m2784x2ysp4mc7m8n8scpr1h38m3p9glcc5jd6cix55bh3yzykk"; depends=[Biobase flowCore igraph Rclusterpp]; }; specL = derive2 { name="specL"; version="1.4.0"; sha256="0i7j5bzvlsyy72xg2gcxggrz25ln3287gcd433mwyiira4apz1il"; depends=[DBI protViz Rcpp RSQLite seqinr]; }; spikeLI = derive2 { name="spikeLI"; version="2.30.0"; sha256="0xqqwxhb89ngfr9jz3z3wsmq8l6lky4hcjnqvf9qd1cwjkf51am9"; depends=[]; }; spkTools = derive2 { name="spkTools"; version="1.26.0"; sha256="0aznmn9si99x32kn2x5swhpahp96bsg71i1wizml0ni6lvmbxn0j"; depends=[Biobase gtools RColorBrewer]; }; spliceR = derive2 { name="spliceR"; version="1.12.0"; sha256="0r5j0ibl2ccsxb7rr2fxw4b07wbdiyfndxkl4pgd9h0ks4qyhyjy"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; }; - spliceSites = derive2 { name="spliceSites"; version="1.8.0"; sha256="1wiahf437sll1xrc5yb8w128rfdl0027g7ajvd04czl1vrq97vrq"; depends=[Biobase BiocGenerics Biostrings doBy rbamtools refGenome seqLogo]; }; + spliceSites = derive2 { name="spliceSites"; version="1.8.3"; sha256="1jifh0nbqjhrc07jfc50hfk4wn1hv3a863rbr3fnqlg9rwg044w7"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; }; splicegear = derive2 { name="splicegear"; version="1.42.0"; sha256="1g2fqql1wqzwz1vx5cq03ckld0gccqk6rv9l99xsaa8mhf0rn1qa"; depends=[annotate Biobase XML]; }; splots = derive2 { name="splots"; version="1.36.0"; sha256="1cj8bygsv1g91cypdz2zbf2slirls7sqdxrvg6qka0n8las58sxd"; depends=[RColorBrewer]; }; spotSegmentation = derive2 { name="spotSegmentation"; version="1.44.0"; sha256="074nzh18pj6dpk9bqh8id0j2vpaxvhi2ddrz6hnza381wzdgxdr3"; depends=[mclust]; }; @@ -1075,17 +1075,17 @@ in with self; { switchBox = derive2 { name="switchBox"; version="1.4.0"; sha256="0lmrg3ahjmz7x3ngjmhkb2w6n2zv0lw40xq1f9lhiyzqzj23rri0"; depends=[]; }; synapter = derive2 { name="synapter"; version="1.12.0"; sha256="0mrqbfg4kwwzm7g2sp1py715w52268kzlkhylqmr1cjqi20b0gb7"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; }; synlet = derive2 { name="synlet"; version="1.0.0"; sha256="05vxkzafgri9ppscv5ark65s15fn3g4lfnkv25ryfddflcfkl1n2"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; - systemPipeR = derive2 { name="systemPipeR"; version="1.4.5"; sha256="0ji9afygadfai60nz1db4wq41l1nycmys1m1xnalpwfy3j244sc2"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; - tRanslatome = derive2 { name="tRanslatome"; version="1.8.0"; sha256="0kblzs5x5bh2bqg5bd5c33b405r33aicba0x0ky02vvqsld64f6l"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; }; + systemPipeR = derive2 { name="systemPipeR"; version="1.4.8"; sha256="09f41q8bnznmrfqwfjfd6h6p6xx20qg1l06dxjajbc0did1fblfz"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; + tRanslatome = derive2 { name="tRanslatome"; version="1.8.0"; sha256="0kblzs5x5bh2bqg5bd5c33b405r33aicba0x0ky02vvqsld64f6l"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; }; ternarynet = derive2 { name="ternarynet"; version="1.14.0"; sha256="0c25xinnlvafwf1x08zmcm1agwflvs9jpckhq58dc5fs8jb4zi6y"; depends=[igraph]; }; - tigre = derive2 { name="tigre"; version="1.24.0"; sha256="10h6wrhsqyifqvylvpy4d5h9brkkq709n3q322wic16q867a9c19"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; + tigre = derive2 { name="tigre"; version="1.24.2"; sha256="0fk73fmqf7d2pb6m5l78rslxh211zzsl9g3snn4507rfxvivcz11"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; }; tilingArray = derive2 { name="tilingArray"; version="1.48.0"; sha256="0ac78mqmjr8wv7zw6rk6q7bxwfmvycsmgybqg4xayja01qvmwkji"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; }; timecourse = derive2 { name="timecourse"; version="1.42.0"; sha256="01awyngw9qalsvagn1f51kdhkqfvscnfhlp50xndr3s2zmmra5xg"; depends=[Biobase limma marray MASS]; }; tkWidgets = derive2 { name="tkWidgets"; version="1.48.0"; sha256="1a4j66pyhyns4mi5dfjqym4kd7dardhvhpr6r4ip34dc1b98hcg1"; depends=[DynDoc widgetTools]; }; - topGO = derive2 { name="topGO"; version="2.22.0"; sha256="029j9nb39b8l9xlzsp83pmjr8ap247aia387yzaa1yyw8klapdaf"; depends=[AnnotationDbi Biobase BiocGenerics graph lattice SparseM]; }; + topGO = derive2 { name="topGO"; version="2.22.0"; sha256="029j9nb39b8l9xlzsp83pmjr8ap247aia387yzaa1yyw8klapdaf"; depends=[AnnotationDbi Biobase BiocGenerics GO_db graph lattice SparseM]; }; trackViewer = derive2 { name="trackViewer"; version="1.6.1"; sha256="12n4rnph5viy0n45v6fl4b473dq71gqqz34hapnav13csy5nxc4i"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges pbapply Rsamtools rtracklayer scales]; }; - tracktables = derive2 { name="tracktables"; version="1.4.1"; sha256="09nl5np0l434d1hl3vfbcnb41dvyzx7123yv0cvpapdyn8zq7j56"; depends=[GenomicRanges IRanges ore RColorBrewer Rsamtools stringr XML XVector]; }; - traseR = derive2 { name="traseR"; version="1.0.0"; sha256="03lqmnb2fann1fn42kr2k126ppgkb5rw7n25h908hmq200mfl122"; depends=[GenomicRanges IRanges]; }; + tracktables = derive2 { name="tracktables"; version="1.4.2"; sha256="1zb51wll7p9kw1q0wnir3gggqxr9p5mc30kk59vjl14apfpbx1vp"; depends=[GenomicRanges IRanges ore RColorBrewer Rsamtools stringr XML XVector]; }; + traseR = derive2 { name="traseR"; version="1.0.0"; sha256="03lqmnb2fann1fn42kr2k126ppgkb5rw7n25h908hmq200mfl122"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; triform = derive2 { name="triform"; version="1.12.0"; sha256="0pqfz6msalr2264iwi2hzam2sv8yl4fy1ri72pff5gh14rbxgiml"; depends=[BiocGenerics IRanges yaml]; }; trigger = derive2 { name="trigger"; version="1.16.0"; sha256="1lswb0zdxkc37xkpyp65md4bv81njl74y6cl3dp9ym5mf47l5azg"; depends=[corpcor qtl qvalue sva]; }; trio = derive2 { name="trio"; version="3.8.0"; sha256="066401wayzl09p9g10j8vl9nhk57351ll1rf28c8ix4kh50pszi5"; depends=[]; }; @@ -1094,13 +1094,13 @@ in with self; { tweeDEseq = derive2 { name="tweeDEseq"; version="1.16.0"; sha256="0dyhczzfbp99nd2ia78scyzw8d02hrwaqr1pqj1c038mm6vsldvb"; depends=[cqn edgeR limma MASS]; }; twilight = derive2 { name="twilight"; version="1.46.0"; sha256="1v3aghnmx1g8kn1z98fx8k71gh2g9q1x52x3lhx70wkzcn6phphd"; depends=[Biobase]; }; unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.6.0"; sha256="0iiwaihywibrfkiayp9dciv9i5n1j13ildwhaxilrha2qdmmjxqm"; depends=[BiocGenerics HTqPCR]; }; - variancePartition = derive2 { name="variancePartition"; version="1.0.0"; sha256="0d7a858fmjsgb91y2p0q84r6vdq5nggp9k5dwdj12jgss7f7lqsj"; depends=[Biobase dendextend doParallel foreach ggplot2 iterators limma lme4 reshape]; }; + variancePartition = derive2 { name="variancePartition"; version="1.0.7"; sha256="10hdxhl4bm1ky5cjiafgbc63aalh75d6ii16gllw0kd4agp2xxfx"; depends=[Biobase dendextend doParallel foreach ggplot2 iterators limma lme4 reshape2]; }; vbmp = derive2 { name="vbmp"; version="1.38.0"; sha256="075hp0bb66fjda8bzhgcmxjhlrncwfwqrzsm885ci928yrl4fyjw"; depends=[]; }; - viper = derive2 { name="viper"; version="1.6.0"; sha256="1z2i5x5rw8wnmvsha2z6jc88hywg2mzq4ss2yfhyx4l8q6ny21vn"; depends=[Biobase e1071 KernSmooth mixtools]; }; + viper = derive2 { name="viper"; version="1.6.1"; sha256="1jmddpbfwnhc9spblr38qljhrzzkc8r2l26h58b996wjrh0x75gh"; depends=[Biobase e1071 KernSmooth mixtools]; }; vsn = derive2 { name="vsn"; version="3.38.0"; sha256="17l1wywbm99g4n08m6wasx59wfavjas0f03a87a1pdv8ff4i71ac"; depends=[affy Biobase ggplot2 hexbin lattice limma]; }; vtpnet = derive2 { name="vtpnet"; version="0.10.0"; sha256="1qvg9f8qa64rpdqv575b7zadf4j1hs5ijhpjk4qjb8h7z5xprr7s"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; - wateRmelon = derive2 { name="wateRmelon"; version="1.10.0"; sha256="1hcfxiiwk0f7i59aj7v55403m755cwfldwniif8x9kkr1xm2n8jh"; depends=[limma lumi matrixStats methylumi ROC]; }; - wavClusteR = derive2 { name="wavClusteR"; version="2.4.0"; sha256="0x58bfwc2akzk6z3hnvf8mcrn24bk8rw2fahf5w21rvvai97pvwz"; depends=[Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer seqinr stringr wmtsa]; }; + wateRmelon = derive2 { name="wateRmelon"; version="1.10.0"; sha256="1hcfxiiwk0f7i59aj7v55403m755cwfldwniif8x9kkr1xm2n8jh"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 limma lumi matrixStats methylumi ROC]; }; + wavClusteR = derive2 { name="wavClusteR"; version="2.4.1"; sha256="0j0cy5bi8pacc6bhy0prlv446m2kgxyjnd5r3vw2lxc1ygllxn6h"; depends=[Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer seqinr stringr wmtsa]; }; waveTiling = derive2 { name="waveTiling"; version="1.12.0"; sha256="0j866mgxj44mv4wp0yqnav83w8pfb47lmjhp1y0qqvxc6q9k80g8"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; }; weaver = derive2 { name="weaver"; version="1.36.0"; sha256="0ixs723mh9p1pq6za8xjqknbq1jq4ylcxsv08f40izmlp40mxjdx"; depends=[codetools digest]; }; webbioc = derive2 { name="webbioc"; version="1.42.0"; sha256="1xli6q0d9y2wikqxk3cf2am3plfk5c27w95q607brs6kl3ghlafl"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 81140f78e437c..92f79b7a36ac1 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,16 +4,20 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2016-01-04"; }; +let derive2 = derive { snapshot = "2016-03-23"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABCanalysis = derive2 { name="ABCanalysis"; version="1.1.0"; sha256="09s38xr6cig88v1nb8a192yc19rnhnqsfzazgfa257c7h84l0g9q"; depends=[Hmisc plotrix]; }; ABCoptim = derive2 { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; }; + ABCp2 = derive2 { name="ABCp2"; version="1.2"; sha256="1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx"; depends=[MASS]; }; + ABHgenotypeR = derive2 { name="ABHgenotypeR"; version="1.0.1"; sha256="08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l"; depends=[ggplot2 reshape2]; }; + ACA = derive2 { name="ACA"; version="1.0"; sha256="0z4wz85iv5k5vw29m6xfh2v96shv314nbxkv3v3yhl77br4bmj4q"; depends=[]; }; ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.3"; sha256="1gqqm9lyc9pmqxj21a1mnf29jpq5aqsfny5wzlp2d8g49dc5hqri"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; + ACEt = derive2 { name="ACEt"; version="1.4"; sha256="1837jindb5bffp7gxp66ffx4z6ardm5g9axm3d42vvbm6m67klc4"; depends=[BH MASS Rcpp RcppArmadillo]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; - ACSNMineR = derive2 { name="ACSNMineR"; version="0.15.11"; sha256="1dl4drhjyazwm9wxlm8yfppwvvj4h6jxwmz8kfw5bxpb3jdnsqvy"; depends=[ggplot2 gridExtra]; }; + ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.01.29"; sha256="1b1243wkncanm1blkqzicjgzb576vzcg4iwinsgn2xqr7f264amf"; depends=[ggplot2 gridExtra scales]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; ACTCD = derive2 { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; }; ADDT = derive2 { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; }; @@ -23,13 +27,13 @@ in with self; { ADPclust = derive2 { name="ADPclust"; version="0.6.5"; sha256="0ni8hkpn11cqrm56w2l4x7fwhw7lls3msf0g8bd62nkwzygqzzrn"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.10.0"; sha256="080qg8s616nx1pj7bdpg3ify2qm3l0gni40nx1xdh81920vj8n7y"; depends=[changepoint forecast signal]; }; AER = derive2 { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car Formula lmtest sandwich survival zoo]; }; - AF = derive2 { name="AF"; version="0.1.1"; sha256="16776dv5rday6d7kh26lsgvmiy76qd1rmrd1rna14q400plqxm18"; depends=[drgee survival]; }; + AF = derive2 { name="AF"; version="0.1.2"; sha256="18bw6c9nlcqcxib4mzhxsjqyjj29xqqvpw668jg2ssqkdphnvzkl"; depends=[data_table drgee survival]; }; AFLPsim = derive2 { name="AFLPsim"; version="0.4-2"; sha256="0bbbvv81nxqp5gc4hdhk0hyhb4n8f9w83kf21cgmqhy9cqnyr4s8"; depends=[adegenet introgress]; }; - AFM = derive2 { name="AFM"; version="1.1.0"; sha256="1b9qm1x1c3097w450lgaihglim4mzzc87b4iqlv1g6mgf9wz5l7k"; depends=[data_table fftwtools fractaldim geoR ggplot2 gridExtra gstat moments plyr png pracma rgl sp stringr]; }; + AFM = derive2 { name="AFM"; version="1.2.0"; sha256="070jd8b8l4f94zp83i7w69fbym0p2sc4vdlfxzzp5ih438i1p0wi"; depends=[data_table fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl rglwidget shiny shinyjs sp stringr]; }; AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; }; AGSDest = derive2 { name="AGSDest"; version="2.3"; sha256="1g8z7ba70zs4i8cb48iwf4iy1q1l76cpiixiac8fixjf1c7a9hxz"; depends=[ldbounds]; }; AHR = derive2 { name="AHR"; version="1.3"; sha256="0i1dqv1prb8iir1rykbhfsl99x05cl582z47wqr7mwkkqf826x9g"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; - AICcmodavg = derive2 { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; }; + AICcmodavg = derive2 { name="AICcmodavg"; version="2.0-4"; sha256="08ry3m4a464gw2j1n528p2fim4flnfy4gbyb1yald001499wdm5v"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; AID = derive2 { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS nortest tseries]; }; AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; }; ALDqr = derive2 { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; }; @@ -38,10 +42,11 @@ in with self; { ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; }; ALTopt = derive2 { name="ALTopt"; version="0.1.1"; sha256="0frpnycnljz6r24cg4z99ivm3rbg9j1nxfkhw18vbrb7gcl1hqj6"; depends=[cubature lattice]; }; AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; + AMCP = derive2 { name="AMCP"; version="0.0.2"; sha256="1ljsb2p7f1cq6qkzcd88a43qcd61myf5xirqcjbjs8rkmj49mg4l"; depends=[]; }; AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; - ANOM = derive2 { name="ANOM"; version="0.4.2"; sha256="17an9qqzx99mgjp0hbk0fl9zs5ynbyifnjcj20ih9srsq8a2qshh"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; + ANOM = derive2 { name="ANOM"; version="0.4.3"; sha256="0ayz5jl7pkz07n0dv4q99n3b47dwxj2ry6x4zc5xz5mgs5pgv2nl"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; APSIM = derive2 { name="APSIM"; version="0.8.3"; sha256="0c4ywixbjc3bdckaqh3mcwb8p0jf65yyd8x0rdqwvj9j3b6d7kj3"; depends=[data_table lubridate plyr sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; @@ -49,21 +54,23 @@ in with self; { ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; }; ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; - ARTool = derive2 { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[car lme4 pbkrtest plyr]; }; + ARTP2 = derive2 { name="ARTP2"; version="0.9.22"; sha256="0vhnhf72x1af77lq8rnqq98hpv5l57by2qm1zxpjvpgpqa5s49ak"; depends=[data_table Formula]; }; + ARTool = derive2 { name="ARTool"; version="0.10.0"; sha256="0y36lghpnhz8fb0gsq4h8mq8y79b2k22wgr7rxj0n12y55xkj028"; depends=[car dplyr lme4 magrittr plyr]; }; ASMap = derive2 { name="ASMap"; version="0.4-5"; sha256="1hrvxkhmycqldah3j1wkja0g7mdx24lyc6gp2x1pnx9fqjanwfy2"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; ATmet = derive2 { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; + AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.0"; sha256="0b6867rfac7kglgigr0gc237sizvbbhg3cymjsjrr2pklkqfp1bn"; depends=[Rcpp RcppArmadillo]; }; AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-4"; sha256="0nvbh4cx0vcsqzs7j6vs6pc6yxb4i0fbjfajdnq6fvnv12m9sz41"; depends=[]; }; - Actigraphy = derive2 { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; }; + Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; }; ActuDistns = derive2 { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; }; AdMit = derive2 { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.62"; sha256="0cxl58by9mfd6hf4hb2d5qnm0pgb0gplgg7mm0qhvckvghjpb00q"; depends=[MASS mgcv nlme SemiPar]; }; - AdaptGauss = derive2 { name="AdaptGauss"; version="1.1.0"; sha256="0ncnwxr2ia9xnf9xg1hy4r6m5ir5rm6fy620r4sjkf4s0d10xl1v"; depends=[caTools mclust shiny]; }; + AdaptGauss = derive2 { name="AdaptGauss"; version="1.2.0"; sha256="18kqqhzy33ivz8g9yj465jb6ih12rzgq090w2n3pgsrckflz11zf"; depends=[caTools ggplot2 mclust shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; }; AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; }; @@ -71,11 +78,12 @@ in with self; { Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; }; AlgDesign = derive2 { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; }; AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; }; + AlignStat = derive2 { name="AlignStat"; version="1.1.3"; sha256="0zaykr7izpms59w6yhxzbjxrcvlq5028vnjqp2l7vy0767ivljci"; depends=[ggplot2 Rcpp reshape2 seqinr]; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; }; Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; - AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; }; + AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; }; AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; }; AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; }; AnalyzeTS = derive2 { name="AnalyzeTS"; version="1.7"; sha256="0ssh8y854s8v833n8fl93nz8arkbj2ac6ihk65ahm7b89phcpd0z"; depends=[MASS TSA tseries TTR]; }; @@ -93,30 +101,31 @@ in with self; { ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; }; ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.0"; sha256="0cq4yzayj3wc45pna59v55xfa6x98q5s62kxwmqs6q76d50z7mzp"; depends=[]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; + AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; }; AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; }; AssocTests = derive2 { name="AssocTests"; version="0.0-3"; sha256="0vin9jkyvmgwk3kjf32qd8q9cj8ibmvdggbh8ny6f413ldyd77qc"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; - AsynchLong = derive2 { name="AsynchLong"; version="1.0"; sha256="097d0zvzjkz3v32qhxdir0xv7kbjkhzy6q5k54w8l4fa2632j3mk"; depends=[]; }; + AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; }; AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; }; AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; - AzureML = derive2 { name="AzureML"; version="0.1.1"; sha256="02w0jqf0c6yl2zhf193qcypwhkbzh2j8qipnkkii2hh1lvwiq52r"; depends=[base64enc codetools df2json jsonlite RCurl rjson uuid]; }; + AzureML = derive2 { name="AzureML"; version="0.2.10"; sha256="0a096pzpp1ij1lj0cj5gh6f3kskgjwhigd4bclkdhvqk07dxcqnv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; }; B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; }; BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; - BAMMtools = derive2 { name="BAMMtools"; version="2.1.0"; sha256="1qn19ji2ra3f83c2d7s072i47cxyc8x3f6fwgl4n4nk3m9knm128"; depends=[ape]; }; + BAMMtools = derive2 { name="BAMMtools"; version="2.1.1"; sha256="1r64n6ym5wjxc4p6pq92lwj7z6nlv33c5ikbimp0c9my7n9dlyby"; depends=[ape]; }; BANFF = derive2 { name="BANFF"; version="1.0"; sha256="0j6rv7p34i9bgl8iig4wg2qg495xskw8j1i3wwvzynz97xn2iyzf"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; }; BANOVA = derive2 { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[coda rjags runjags]; }; - BAS = derive2 { name="BAS"; version="1.0.8"; sha256="067a4n8xi75z0ybd7ysx2kc2z843cv1mqhzybkj9s0a1cg2q624c"; depends=[]; }; + BAS = derive2 { name="BAS"; version="1.0.9"; sha256="0jhf9ijarvib924hfy1j39mifaraazzv8lp6fqvrj27fxndmhxw7"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BAT = derive2 { name="BAT"; version="1.4.0"; sha256="18152jd8k3pngnjgzjmbvsk5qhxsqsi3k1yfdrcb61n4hvqxgns1"; depends=[nls2 spatstat vegan]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; BB = derive2 { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; - BBEST = derive2 { name="BBEST"; version="0.1-5"; sha256="0lsz4f4ygv53a04b6007krimsgkvk42cnmr1zlhx0ms5lwbbh34h"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; + BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; }; BBmisc = derive2 { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; }; @@ -124,26 +133,28 @@ in with self; { BCBCSF = derive2 { name="BCBCSF"; version="1.0-1"; sha256="0hvhnra68i0x78n57nlbxmz0qwl2flng9w47089jw6f9hzkq9r7n"; depends=[abind]; }; BCDating = derive2 { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; }; BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; - BCEA = derive2 { name="BCEA"; version="2.1-1"; sha256="1j2zb2icv5b6kwgbjzvidbzvciag89227ina6qcb2m4g6spyxcrm"; depends=[]; }; + BCEA = derive2 { name="BCEA"; version="2.2-2"; sha256="0nal906l60f6llv8dzfsa0367abdkch0gc13rb3jix3cn0iwfwlf"; depends=[MASS]; }; BCEE = derive2 { name="BCEE"; version="1.1"; sha256="0pssqmjj13wjbkq8ls5r9zr08by24q0k9g4f1aysgxds2a4dawd1"; depends=[BMA]; }; BCEs0 = derive2 { name="BCEs0"; version="1.1-1"; sha256="1ipg8xliqnpfa4ga9r0gqf5sfa9gass4hvrlgxazs5hb18fpsl91"; depends=[]; }; BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; }; + BDWreg = derive2 { name="BDWreg"; version="1.0.0"; sha256="0fv9w19ansrfil9lx7v32p392h9mfal1znj8p47p1n22jbk208x8"; depends=[coda doParallel foreach MASS]; }; BDgraph = derive2 { name="BDgraph"; version="2.26"; sha256="0lbn7780pn55hm46ml7sgmcv3vvlwaa54hhks3z634hnyjk8f3b8"; depends=[igraph Matrix]; }; BEANSP = derive2 { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; - BEDMatrix = derive2 { name="BEDMatrix"; version="1.1.0"; sha256="1ir4mjqcgvsivqr5k7vccklk6kgxi3ydxlisdc7qn2nspxpsvj96"; depends=[BH Rcpp]; }; + BEDMatrix = derive2 { name="BEDMatrix"; version="1.2.0"; sha256="1j80gdkir5p5wlfq7p3bnqcphm6fmxgya46ga0ifz1rxiwqhw5vf"; depends=[BH Rcpp]; }; BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; BEST = derive2 { name="BEST"; version="0.4.0"; sha256="1clch2271x9r5frgpis31b13jjgp4sdxd75s44chcislyzlinrlp"; depends=[coda jagsUI]; }; BGLR = derive2 { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; }; - BGPhazard = derive2 { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; }; + BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; BH = derive2 { name="BH"; version="1.60.0-1"; sha256="08gc3b0irgvpjl59irdxs8jhlbky4yp4fvs3zi4pq0wdwj43cfsk"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.7-0"; sha256="09bj6znh159n3w603wp6m3l54dpmf3j9bv8xvn4sp511yin9p9b2"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; }; - BIGDAWG = derive2 { name="BIGDAWG"; version="1.2.1"; sha256="0n0bpdjbfdksnym3bd6dcsibyclf8w3ds85x2jvz5ba5ch3wq3va"; depends=[haplo_stats XML]; }; + BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.8-0"; sha256="1lizj7jyh8130y8b2ls912yfr2rf2pfnsmbm6vnfqrhj2xc6b33h"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; }; + BIGDAWG = derive2 { name="BIGDAWG"; version="1.2.8"; sha256="0ahj2lwfd36lrqpaf2ywjq9i3603dydyw4c2hzx86czaanp2xcx6"; depends=[haplo_stats XML]; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; - BIOdry = derive2 { name="BIOdry"; version="0.2"; sha256="07h05qibzqqfk4d73pzrb48djmzby7ysl6cszf2irivp66cqnbkp"; depends=[ecodist nlme]; }; + BIOdry = derive2 { name="BIOdry"; version="0.3"; sha256="0dn9nbh0h1wz351xba8g7i0g2jv0v5p1rrxpq842lbfibn2wn0q5"; depends=[ecodist nlme]; }; BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; }; + BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; }; BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; }; BMA = derive2 { name="BMA"; version="3.18.6"; sha256="1yx54miy5vn8rb5aynsjsfjxkblq0n1k86h1iyr14rf4q9sd3phi"; depends=[inline leaps robustbase rrcov survival]; }; @@ -156,12 +167,12 @@ in with self; { BNPdensity = derive2 { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; }; BNSP = derive2 { name="BNSP"; version="1.1.0"; sha256="1l45x3h0jqszcp7zws6y4nbq2vzyv6aa60kwqfpkjw0kdbbcpw7m"; depends=[]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; - BOIN = derive2 { name="BOIN"; version="2.0"; sha256="1jyj41936nd6dianifa0bhh9fzpj72fb87g6hgq7m9zi04cnp69s"; depends=[Iso]; }; + BOIN = derive2 { name="BOIN"; version="2.1"; sha256="14xfjp1ir1mlg3wayn66rnwnjccdpnk7p0l59455v1wglbajnzb3"; depends=[Iso]; }; BRugs = derive2 { name="BRugs"; version="0.8-6"; sha256="0nvp3lwliq72qibvz4bg6c7ixxmhgwl87hyl2qvkgiavix3nkxk7"; depends=[coda]; }; BSDA = derive2 { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.1"; sha256="1zp8352mgqpmyn63b5xfmq67rsf3cdy7yy5k1qihdlkw9bi5r3vc"; depends=[doParallel foreach MfUSampler survival]; }; - BSSasymp = derive2 { name="BSSasymp"; version="1.1-1"; sha256="1q2ci9wkz9jd8sr3qqrsbqcd395pfi6agcn3swkz5cxkv1na7k7h"; depends=[fICA JADE]; }; + BSSasymp = derive2 { name="BSSasymp"; version="1.1-2"; sha256="1c1s574ss7vm00hykv6ahlsw6yzsxdj96cfcj4f1khrmnakiv7z3"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; BTLLasso = derive2 { name="BTLLasso"; version="0.1-2"; sha256="02zd0fp7km4l2ks50z37gqcbpq6fsvkiwqnccndszrwqhi41x7y5"; depends=[Matrix Rcpp RcppArmadillo stringr]; }; @@ -171,9 +182,9 @@ in with self; { BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; }; BaM = derive2 { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda foreign MASS mice nnet survival]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; - BacArena = derive2 { name="BacArena"; version="1.0"; sha256="1ivsa1az8w30kb04yx2q7924bdijml83hn6p8jdaarlkpbslklmn"; depends=[deSolve Matrix Rcpp RcppArmadillo RcppEigen ReacTran sybil]; }; + BacArena = derive2 { name="BacArena"; version="1.0.1"; sha256="1hr454nyrd3cn901ppj5giimn7nyakv9fbc9lz4fvb7srw915lg2"; depends=[deSolve igraph Matrix Rcpp RcppArmadillo RcppEigen ReacTran sybil]; }; Bagidis = derive2 { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; }; - BalancedSampling = derive2 { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; }; + BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.1"; sha256="10km8xcaz1vrabdgbanajza0667w5l8ly7n7lgil2ip9cgfxyw2p"; depends=[Rcpp]; }; Barnard = derive2 { name="Barnard"; version="1.6"; sha256="1wk93yj4pl3mybyl2lvgbpq0chpm4akx3rqb29dk34fkfiwmvlhq"; depends=[]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; @@ -197,9 +208,9 @@ in with self; { BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; }; BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; - BayesTree = derive2 { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; }; + BayesTree = derive2 { name="BayesTree"; version="0.3-1.3"; sha256="1wa72mzy1mxw64r1hzadimz0ngi6ng7sbgak7g55rbgj8bmj02yk"; depends=[nnet]; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive2 { name="BayesVarSel"; version="1.6.1"; sha256="1pmhbyvsq4k2kqnbnxm089qxil0ac61msa204pck6r0b360pmpnh"; depends=[MASS]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="1.6.2"; sha256="1sc26rwa1z1wf8qs21js8xbna51vknd4jcdhvikn8s0i5413l85y"; depends=[MASS]; }; BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; @@ -224,49 +235,51 @@ in with self; { BinNor = derive2 { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; }; BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; Binarize = derive2 { name="Binarize"; version="1.1"; sha256="07r41n5123pk6nwdwajgw6m3w38kprf4ksinx4rjldd8h1yd6rik"; depends=[diptest]; }; + BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; BinaryEPPM = derive2 { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[expm Formula numDeriv]; }; + BioFTF = derive2 { name="BioFTF"; version="1.0-0"; sha256="0k5n82g633gdnyp7rmmm0gvmkhfjgm3frw4shhy0v1jlcvlp9v6n"; depends=[]; }; BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; }; BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; }; Biocomb = derive2 { name="Biocomb"; version="0.2"; sha256="1igav8l1s4byannhkdm5fznqrga6cv9ws1lxyam221h8cl3qz8aw"; depends=[arules class discretization e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.5-4"; sha256="0w5nn0wv7fknnmbzilxwsh5wfmb6vagxvsh1gy1mzm5fiknfzh9k"; depends=[Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.6-1"; sha256="181pz4zjx0kvj5m688g8ffaywa60mssgmkl0w60r8195sj80c3y5"; depends=[Rcmdr vegan]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; Blaunet = derive2 { name="Blaunet"; version="2.0.1"; sha256="0zpx4l5ig0xjnpsgw24b01nnf8w0aw6imjsg9715rm0qswa0jq5y"; depends=[network]; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; - Blossom = derive2 { name="Blossom"; version="1.3"; sha256="1cpqzfpyaj00zkjrhj0xy43wy05hvlw5a50a3i1shyv0pd04h23z"; depends=[]; }; - Bmix = derive2 { name="Bmix"; version="0.5"; sha256="0cwp0z5841yqndpln8vc7wkbc8jgdwf0a772x4rgpihvg1g9qz5j"; depends=[mvtnorm]; }; + Blossom = derive2 { name="Blossom"; version="1.4"; sha256="0002rvz0mlwl2clglzqldg0x5l8lj07qh74ifpdaf1lrdailh328"; depends=[]; }; + Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; }; BoSSA = derive2 { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; }; - Bolstad = derive2 { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; }; Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; + BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.1"; sha256="0g8f2pv8s8kj84qcp2fy3h8p91ja6ap2dgxkdaf5kjv7r3hfddg0"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x7zxyr3pg212cgkx9arby0afn"; depends=[BH MASS]; }; - BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[BH Boom]; }; + Boom = derive2 { name="Boom"; version="0.3"; sha256="0j5j4x77fqwgc6f6d91v02niq4mrdfi0x5id0mq9zdha0rnidcky"; depends=[BH MASS]; }; + BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.5.3"; sha256="0932jwc7bz84lryzaxd4lncqbkc3d0v2yh22dvryz2hf59a2a5lj"; depends=[BH Boom]; }; BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; Boruta = derive2 { name="Boruta"; version="5.0.0"; sha256="0sz9rbpxwjaz3l4kx4b616x2kfb2szv8s1qk4qv05smqf34hf8rw"; depends=[ranger]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; }; - BrailleR = derive2 { name="BrailleR"; version="0.22.0"; sha256="13bwy6mcmh57iznm600r34mz757i9dy6f2nb3a2jw1xvk5zsnasz"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest rmarkdown xtable]; }; + BrailleR = derive2 { name="BrailleR"; version="0.24.1"; sha256="181s8rz5n9yvnsg3nj7n43giyjiabrk3j1bl64z7aq3x15cx0xqs"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; }; Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; }; C50 = derive2 { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; }; - CALF = derive2 { name="CALF"; version="0.1"; sha256="0nd5w6ywijm5f7zn6c3ryw1885h32qp8yg1d5424fsq9f60jyh41"; depends=[]; }; + CALF = derive2 { name="CALF"; version="0.1.1"; sha256="1ikmlf6fkma2q281m012ifbxfavx4cywvf0igs4fxpkd7jm9frff"; depends=[]; }; CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; }; CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; }; CAMAN = derive2 { name="CAMAN"; version="0.73"; sha256="0acksmgi7g0nngq5wcyrxzplxk6h8yi0s1q1pdkqna8dyriw7ih1"; depends=[mvtnorm sp]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="0.11"; sha256="12d5558b3wldla3sgwqdqwmfixcqfa8h92bq4a8ia284946vcbbf"; depends=[Hmisc reshape2]; }; - CARBayes = derive2 { name="CARBayes"; version="4.3"; sha256="1c98y2pmwqh7g6nn9ccw39xgklyhixg99bz13qkzdyl0yl5h9jdh"; depends=[CARBayesdata coda MASS Rcpp sp spam spdep truncdist]; }; - CARBayesST = derive2 { name="CARBayesST"; version="2.1"; sha256="1wlvcndqvpfyi6p5gps3p97m8yvbd57adqd5d7al1jc9k493yvfd"; depends=[coda MASS Rcpp spam truncdist]; }; + CARBayes = derive2 { name="CARBayes"; version="4.4"; sha256="0ab259mglhli6443mgxsgzfmi7wam6m1498lc5ihha4px05cbkl0"; depends=[CARBayesdata coda MASS Rcpp sp spam spdep truncdist]; }; + CARBayesST = derive2 { name="CARBayesST"; version="2.2"; sha256="0kcx708g88hm70ss73cry4h4w2j32bj65rxn31sjfghgsnvd7fp6"; depends=[coda MASS Rcpp spam spdep truncdist]; }; CARBayesdata = derive2 { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; }; - CAvariants = derive2 { name="CAvariants"; version="3.0"; sha256="1nds4ngda6qjm74bwwphd4a648q66xj25x0n9xvb3fdzfkqfvvrp"; depends=[]; }; + CAvariants = derive2 { name="CAvariants"; version="3.1"; sha256="0plxkz8slvk824ziwxc27dricid3ddm18bsl3dvqprarh9l1r0ja"; depends=[]; }; CBPS = derive2 { name="CBPS"; version="0.10"; sha256="0k3mb97d49r870dm7ac1nwhy4kvh0936jmka7ib03154jmzsfyn7"; depends=[MASS MatchIt nnet numDeriv]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; @@ -277,8 +290,9 @@ in with self; { CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive2 { name="CDM"; version="4.6-0"; sha256="16y2d8fv2f8al32c3aji2x6z94nsl4rjg219wqj27xwsv6zfrcx3"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; }; + CDM = derive2 { name="CDM"; version="4.8-0"; sha256="0k99ppspr3k7lgjxqbnp2fwvpl3zidi1c0zzwwj7i4v29nbf4fiq"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; + CDROM = derive2 { name="CDROM"; version="1.0"; sha256="0dnaviaw9zfkdss2mjk7mccgrfya70491hqzx6wdlpzspchzm9ni"; depends=[]; }; CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; }; CEC = derive2 { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.0.0"; sha256="1rsia7dnbc2hwrihdxdaspwm8xfvc7ryy3sgki801xv3la4nzk8p"; depends=[DEoptim MASS]; }; @@ -308,12 +322,13 @@ in with self; { COMBIA = derive2 { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMMUNAL = derive2 { name="COMMUNAL"; version="1.1.0"; sha256="1fv5dlqajpsd9k99sfikj3ai4jpzz2fh4s3gfglwrajk0nzlxjg2"; depends=[cluster clValid fpc]; }; COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.3.5"; sha256="15w78h0kkqbisp34g4wj2mkq4c0pb2166f1m7s65iifnnd5plvb6"; depends=[]; }; - COPASutils = derive2 { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[dplyr ggplot2 kernlab knitr reshape2 stringr]; }; + CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; CORElearn = derive2 { name="CORElearn"; version="1.47.1"; sha256="0apsv6lam5a6miirhq6z0acm4xnynyskqp94cxvxpgkaaap2c55l"; depends=[cluster rpart]; }; CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; }; COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; }; COUNT = derive2 { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[MASS msme sandwich]; }; + COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; CP = derive2 { name="CP"; version="1.5"; sha256="0hzp4h7bhhxn336kkq27phplk7idwk27jjsp6zimwl8fq3ylh0dr"; depends=[survival]; }; CPE = derive2 { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; }; CPHshape = derive2 { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; }; @@ -323,6 +338,7 @@ in with self; { CRF = derive2 { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Matrix Rglpk]; }; CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; + CRTgeeDR = derive2 { name="CRTgeeDR"; version="1.1"; sha256="10gm6dmn8hwg5kbfvzdjfdvsv6ii0hn00512jchfj1f6gxxq5ha2"; depends=[ggplot2 MASS Matrix]; }; CTT = derive2 { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CUB = derive2 { name="CUB"; version="0.0"; sha256="0a3iz90i0mshfxqykbfyrhmy45iyzh81r680hasvrbakqnm94a82"; depends=[]; }; @@ -345,37 +361,41 @@ in with self; { CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; }; CensMixReg = derive2 { name="CensMixReg"; version="0.7"; sha256="0ricfbm1k7dvsj658sj9ava8xgwqzypi99ihn41llnfdgdnslifs"; depends=[mixsmsn]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; + CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; }; CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChainLadder = derive2 { name="ChainLadder"; version="0.2.2"; sha256="1lxcy7q02lgsi575z1l1bxhxrgc3qcf2ln09pf4rb4diw7fs6ply"; depends=[actuar cplm ggplot2 lattice Matrix reshape2 statmod systemfit tweedie]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.3"; sha256="1gj2chziyaq1f6ahgpnr62c2fy72kbvxcivmg42rh853r7xmmwvv"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.5"; sha256="0hgvcvqgqn22n874y268rchy88jgyp4lv5nbdyzgyay2arwsjjdy"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; + ChaosGame = derive2 { name="ChaosGame"; version="0.2"; sha256="1d6c2zjh7d5d1abi07d9akjjbpccvlnra96f2w58rdr87dy757zq"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; - ChemoSpec = derive2 { name="ChemoSpec"; version="4.1.15"; sha256="147ynbj8w4hiwfac3637s2skyjyyyv19axwv5bxlg73kvp40zp0h"; depends=[plyr rgl]; }; + ChemoSpec = derive2 { name="ChemoSpec"; version="4.2.8"; sha256="1ym2fy6dg2v9z6bld99snnydmmd03sr5m6clf9m2xwnkm252wcr4"; depends=[plyr rgl]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.9"; sha256="095jahs7n591fam7s6i38h2iw5jbl005n040s1i489zzmsnj2n6d"; depends=[ChemometricsWithRData kohonen MASS pls]; }; ChemometricsWithRData = derive2 { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; CircNNTSR = derive2 { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; }; - CircOutlier = derive2 { name="CircOutlier"; version="3.1.3"; sha256="103d5fbwzbj9ribl2vzrj1lxv0n3hcygjrf5k4kqm0kfnql91k2s"; depends=[CircStats circular]; }; + CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircStats = derive2 { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[boot MASS]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; ClickClust = derive2 { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; }; ClimClass = derive2 { name="ClimClass"; version="2.0.1"; sha256="13h6qj7wda5n1vgfqpclp0n3ir4qqqm7f00zlnq7dfpifd7ci4vn"; depends=[geosphere ggplot2 reshape2]; }; + CluMix = derive2 { name="CluMix"; version="0.3"; sha256="1yaznpv1aiqpg5ywqypharf8vigvgw0ihik7m8wfjbj2rzmlhj33"; depends=[ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; ClueR = derive2 { name="ClueR"; version="1.1"; sha256="1pk8l1qsiaypj34kbc3ikznn16ndn1alf1kgx0cx6pkhn2fpan2l"; depends=[e1071]; }; ClustGeo = derive2 { name="ClustGeo"; version="1.0"; sha256="0n7i6lwc86cizpn5ibd6k9i41w8fcbh1cdxqm7w52z024w0z40jh"; depends=[FactoMineR plyr rCarto]; }; - ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp]; }; + ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.3"; sha256="1yvz5qpmagmld757nlc641imiv715mgwkni1d04zq99rf0bvxapf"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="1.4.1"; sha256="02a3ljds8hlkmpa0hw2mm51abimw23dnvr8c08bx2671284nwzmc"; depends=[Rcpp]; }; - ClusterStability = derive2 { name="ClusterStability"; version="1.0.2"; sha256="1bhkrgavvakkkc36hcxvgvhrryqniw61hh1wnsr5wbvkz2inh6if"; depends=[cluster clusterCrit Rcpp WeightedCluster]; }; + ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; CoClust = derive2 { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; }; CoImp = derive2 { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula gtools locfit nnet]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.2"; sha256="0bs4ivnk394l7xjxyvg7fhlfi3vdscp1c27dpvilrlmfikbzpc33"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; - ComICS = derive2 { name="ComICS"; version="1.0.1"; sha256="04jniacphllzhv6rcdxjdx570rsbdrx3kiyslfmwyj51hx4bqjnv"; depends=[glmnet]; }; + ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; }; CombMSC = derive2 { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; }; CombinS = derive2 { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; }; Combine = derive2 { name="Combine"; version="1.0"; sha256="0n3jkxf4s778d6fzcanb2b09xhpv5sqzawpg17bbfngfhp0vfyrq"; depends=[]; }; @@ -394,6 +414,7 @@ in with self; { CompareTests = derive2 { name="CompareTests"; version="1.1"; sha256="1assdqwr5qhwfqhc8gpfa53kcmd4dy5fb449pm4ng0n674qvra6c"; depends=[]; }; Compind = derive2 { name="Compind"; version="1.1"; sha256="1435b8g6dzim7hff6kvxgx00linx5gk9y7zidbmishsybv5r1mar"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; }; ComplexAnalysis = derive2 { name="ComplexAnalysis"; version="1.0"; sha256="1yk0r3iwxirjsksnpwpnrgq4yhni6in9kgxxrs7v51l35zn78kji"; depends=[]; }; + Compositional = derive2 { name="Compositional"; version="1.1"; sha256="167823g2a3cnnkmvhdc5wnjic0ih1xz2xfymgh5dicfzr9inasb5"; depends=[BB doParallel foreach MASS mixture quantreg sn]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; ConSpline = derive2 { name="ConSpline"; version="1.1"; sha256="0ap3qxqdby9rf665vh40m6f4wjz7q3cz8i4abw1ccryjlwjv1kzp"; depends=[coneproj]; }; @@ -406,7 +427,7 @@ in with self; { ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; }; Copula_Markov = derive2 { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; }; - CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.1"; sha256="1fv6d2njjk1cp5h90dmn5l35awvngwbp7n4cabqylci2w0pkilmn"; depends=[ggplot2 plyr reshape2 rstan]; }; + CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.2"; sha256="1k02r0i56fwwk155b7xy9dzxnmvnslzrcc90azixxhhc9rc1xsaq"; depends=[ggplot2 plyr reshape2 rstan]; }; CopulaREMADA = derive2 { name="CopulaREMADA"; version="0.9"; sha256="0fhd4g8157rmkda5dygvnvb50f8dz31wlg1x432g9ra8fw7bdq01"; depends=[matlab statmod tensor]; }; CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; }; @@ -416,18 +437,18 @@ in with self; { CorrMixed = derive2 { name="CorrMixed"; version="0.1-12"; sha256="10wcg2rn4dcx87wv6h51rk31gdh7pc0bbgmdi1qvwd08nlqc3zsy"; depends=[nlme psych]; }; Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; }; CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; }; - CountsEPPM = derive2 { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[expm Formula numDeriv]; }; + CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; }; CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; }; CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; - CpGassoc = derive2 { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; }; + CpGassoc = derive2 { name="CpGassoc"; version="2.55"; sha256="0vnksx66z8rfm5s5hn49p9ps26jwn6w2216bqw2k9xv77rr68phn"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; Crossover = derive2 { name="Crossover"; version="0.1-15"; sha256="1g9z4ssqyb3silaprcsjsdd1bk5rsih2hvqr6rm1qb8ayqjr1sp3"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; - CryptRndTest = derive2 { name="CryptRndTest"; version="1.1.5"; sha256="0zw487g31j25hzskl0g466y8p7dqmivkhgwfyg3lgs3i61mxx7px"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; + CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; }; Cubist = derive2 { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; }; D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; }; @@ -447,14 +468,17 @@ in with self; { DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; - DCchoice = derive2 { name="DCchoice"; version="0.0.13-3"; sha256="0p2apjygzg28w0i6zgvy9kikz46718j6wjsahvn6x33c48zra44r"; depends=[Ecdat interval MASS]; }; + DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; + DCchoice = derive2 { name="DCchoice"; version="0.0.14"; sha256="0w2s4wqla39g8dbvnq01lmxl2zfg4znl37z8if6y00clynlnphxs"; depends=[Formula interval MASS]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; - DDD = derive2 { name="DDD"; version="3.0"; sha256="0fsdj4wp1dv1g5xfvy69rqcff00aqzch8rgnqkisv83fnrf9k4r8"; depends=[ade4 ape deSolve Matrix phytools subplex]; }; + DDD = derive2 { name="DDD"; version="3.2"; sha256="1d1va8qpzii5538zg9j5kf7i3hh90a2gdndhj35qvdgldwqj4rhh"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; }; DDHFm = derive2 { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; }; DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; }; + DDRTree = derive2 { name="DDRTree"; version="0.1.3"; sha256="08h89pm1n8c8yvkm5qx2aqhz3c3x1ljy551gsq5waxjvmq06k8fy"; depends=[BH irlba Rcpp RcppEigen]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; }; DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; + DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DESP = derive2 { name="DESP"; version="0.1-6"; sha256="0gzhzchliwsjynsj9jrwrxdg5is3ph0inibfips7526ry1bfj93x"; depends=[graph MASS Matrix RBGL SparseM]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; }; @@ -462,11 +486,11 @@ in with self; { DFIT = derive2 { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[ggplot2 mvtnorm simex]; }; DIFboost = derive2 { name="DIFboost"; version="0.1"; sha256="1wms7k1h09an46zi0sx2qi83zhzhqc864abnxn5iybv5g72xj89k"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso miscTools penalized]; }; - DIFtree = derive2 { name="DIFtree"; version="1.1.0"; sha256="0pxqa1w4mppsj61nr3pw24zmrhkgqy1pbqi3cpi0ppxnrj4ibbbs"; depends=[penalized plotrix]; }; + DIFtree = derive2 { name="DIFtree"; version="2.0.1"; sha256="0mm9v1sg6n0mdrplnpxflhzg5diksdns3wd8h24drzb8ww9mvfri"; depends=[penalized plotrix]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive2 { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; - DJL = derive2 { name="DJL"; version="1.8"; sha256="11kbl1r4g81pl9mpbdb2s4adqvdr3mfpyzplgxdrnl776xba6qsf"; depends=[car combinat lpSolveAPI]; }; - DLMtool = derive2 { name="DLMtool"; version="2.1.1"; sha256="0bvil9h1vg73ahlbi36ji74bp9r819yamy69jbvy4fgn98q0lhn6"; depends=[boot MASS snowfall]; }; + DJL = derive2 { name="DJL"; version="2.0"; sha256="06m7r6qvphzjkpp83ync3666p7rac5p81c3hqk5mhr9iykfzrh0f"; depends=[car combinat lpSolveAPI]; }; + DLMtool = derive2 { name="DLMtool"; version="3.1"; sha256="1ir04s2npgdy30550gbfccjv5jzsh54qm5g4pw97y24i6qag1qcq"; depends=[boot MASS snowfall]; }; DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DNAprofiles = derive2 { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[bit Rcpp RcppProgress]; }; @@ -476,6 +500,7 @@ in with self; { DOvalidation = derive2 { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; DPpackage = derive2 { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; }; + DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; @@ -487,18 +512,19 @@ in with self; { DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; - DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; }; - DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.4"; sha256="1yph19ychzlk1v18qyrsy6hd7ixwzxmcfcfy8i5l6ax7kwp3a0yb"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; + DTRreg = derive2 { name="DTRreg"; version="1.0"; sha256="0ry6n9hl5j1s4j8n9zqvh87qbm4vm8hvix61js1zfys42hnv10af"; depends=[]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.5"; sha256="0b8wv1vz1xr7czcnva9lg69gpsryx6n1g0s901vxdriycacmyhqg"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; DWreg = derive2 { name="DWreg"; version="1.0"; sha256="0nws1gr5w7rwl4agkmz98y5ljmbipwryg81kc8mn1y8ppnpx02m0"; depends=[DiscreteWeibull Ecdat maxLik]; }; - DYM = derive2 { name="DYM"; version="0.1.1"; sha256="0k6iqn1397by9pg31m3ypbnn85zv192ghsn4gpnsfhqfcp18q4d4"; depends=[]; }; + DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; }; Daim = derive2 { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; - DandEFA = derive2 { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; Dark = derive2 { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; }; DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; - DataCombine = derive2 { name="DataCombine"; version="0.2.18"; sha256="1y3mh29ly63ji4i8r8lpawb0l2x9rphmklfc75i289j0q3l3ma38"; depends=[data_table dplyr]; }; + DataCombine = derive2 { name="DataCombine"; version="0.2.19"; sha256="0y7rrpfv4c63cf3v68y9bnwcx450cj9v66k8a53x62d88096f5pb"; depends=[data_table dplyr]; }; + DataExplorer = derive2 { name="DataExplorer"; version="0.2.4"; sha256="0dz2lyn67cak9ada1ghy33zk72i9j4xbz9mjbf8xffwmsrmspi04"; depends=[data_table ggplot2 gridExtra reshape2 rmarkdown scales]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; Davies = derive2 { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; }; + DecisionCurve = derive2 { name="DecisionCurve"; version="1.1"; sha256="18966kynlpagrxciks8bxy6s31qq6zxy4vw6y24fa1axg1gfbxd9"; depends=[caret MASS pander reshape]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; }; DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; @@ -510,24 +536,27 @@ in with self; { Demerelate = derive2 { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts mlogit sfsmisc vegan]; }; DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; - DepthProc = derive2 { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm]; }; - Deriv = derive2 { name="Deriv"; version="3.6.0"; sha256="0ajjvdg9j877lcf2bwcs5b8vqjn8j0672sq6kcnizvxr3jyz18w6"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.15"; sha256="1vw8xgia7b06gz0kaa6d7g5jdd3iirhcqd822nyk1m8cl1hs21bl"; depends=[BH boot foreign manipulate mvtnorm Rcpp]; }; - DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[GGally ggplot2 plyr proto reshape2 scales]; }; - DetMCD = derive2 { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[Rcpp RcppEigen robustbase]; }; + DepthProc = derive2 { name="DepthProc"; version="1.0.7"; sha256="1vnx9lhcrzsyygpq1rii4crxrz4c4vs60dnw0ha0y3j1mh0yxc2k"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm]; }; + Deriv = derive2 { name="Deriv"; version="3.6.1"; sha256="06m0c0fxsn7yaw0z8l9bgcr6smw690wbvnk23iikkkshygp6jhrd"; depends=[]; }; + DescTools = derive2 { name="DescTools"; version="0.99.16"; sha256="1k7r6vfcpgz93qpyqbczl40zb194nzhh3l4kng4fzpqr56wp3s7w"; depends=[BH boot foreign manipulate mvtnorm Rcpp]; }; + DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; }; + DetMCD = derive2 { name="DetMCD"; version="0.0.3"; sha256="1rxc6d1m5i6a73cxf66kpk687b7dwk8bhji97vbzrz19r8hwqq2b"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; + DetR = derive2 { name="DetR"; version="0.0.4"; sha256="0kvmbh7cdy3hmds1znahy1lqhd68y21kmmcki9xbq1b76n4h812n"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; DiagTest3Grp = derive2 { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car gplots KernSmooth]; }; - DiagrammeR = derive2 { name="DiagrammeR"; version="0.8.1"; sha256="1qqcipfaf0rs25mic4db8vjf8nllwyv3xv02cvpkfa25klwn1fbm"; depends=[htmlwidgets rstudioapi stringr visNetwork]; }; + DiagrammeR = derive2 { name="DiagrammeR"; version="0.8.2"; sha256="0zjziph3xri9w277bi9b54n00mv7pmrygk155xzfcwvrix4g8868"; depends=[htmlwidgets rstudioapi scales stringr visNetwork]; }; + DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; }; DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; }; DiceKriging = derive2 { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; }; DiceOptim = derive2 { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging lhs MASS mnormt rgenoud]; }; DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; - DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.1"; sha256="0kmccl7w0dfigih692i0ki5vzjk7s5ayymaq37ypkm55c8x6l6zn"; depends=[Rcpp RcppArmadillo rgl]; }; + DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.2"; sha256="19mzrsra290lapznlh9pvr4pzrapfa28pa10j8dyqnsfx3dc5r4c"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; + DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.0"; sha256="0nha6hq3fa04ymxk8hplgff7fnlrc7hx0iyws1nkgih4va6mx815"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; - Directional = derive2 { name="Directional"; version="1.5"; sha256="0a6794dz7dj2kwbrp3sp78v496cmv7m7svqwcmqvgf9viwjrx1k1"; depends=[abind doParallel foreach MASS]; }; + Directional = derive2 { name="Directional"; version="1.8"; sha256="1q1fpzp83980lg04mq90kcffh3jjfp2jx3x4bc5bj6mclhpymxam"; depends=[abind doParallel fields foreach MASS]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; }; Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; }; DiscML = derive2 { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; }; @@ -535,49 +564,53 @@ in with self; { DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1"; sha256="1pcq4kggy1z88a0car53d0f69rx2qg7q104cr0bxi6yllrb3q0nr"; depends=[Rsolnp]; }; DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; }; DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; + DisimForMixed = derive2 { name="DisimForMixed"; version="0.1"; sha256="1kl6n1i7si0r2rabxcfd78971p3ykxkq3w66ra1flzjn8gs6li38"; depends=[cluster dplyr]; }; Distance = derive2 { name="Distance"; version="0.9.4"; sha256="18iip9xny2vazpah96qziqwql4hnxg2m8hyjhh8b34w29jv0nsm5"; depends=[mrds]; }; DistatisR = derive2 { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; }; DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; }; DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; }; DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; + DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.2"; sha256="0cv0cw24x00gfy7hx97fz82j6smcmc9w9vsig00bb3ip3ba1d4y8"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DiversitySampler = derive2 { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; - DoE_base = derive2 { name="DoE.base"; version="0.27-1"; sha256="1r2vwiid76cc5nmjisidwpx2jnp8d2ln7s6mb34qxh1g5d489izg"; depends=[combinat conf_design MASS vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="0.28"; sha256="0w68gg1829dhfm4valw66ld4ccapygpcpds7j2mnmlq9g4l847ca"; depends=[combinat conf_design MASS vcd]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; Dominance = derive2 { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[chron gdata igraph]; }; - DoseFinding = derive2 { name="DoseFinding"; version="0.9-13"; sha256="1i141ybp5ybpcyx1rnhnk1nxh4vkmb18glxgqhplvym6nbb3k6na"; depends=[lattice mvtnorm]; }; + DoseFinding = derive2 { name="DoseFinding"; version="0.9-14"; sha256="04f0v3vcw0p10ahi2cyqndfwjqgvmp8ghxc3nmikhw7prp9yimzn"; depends=[lattice mvtnorm]; }; DoubleCone = derive2 { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; + Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; }; + DrugClust = derive2 { name="DrugClust"; version="0.1"; sha256="1p3pxc1qxp26sxa52877dq1mf3nwx7vbvcr8d1i8ccmhmccayrdb"; depends=[cclust cluster e1071 MESS ROCR]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="2.0"; sha256="1ckdx2cn5ylsks65ydlhjcqsvpdbm6hwm67snqn9zj4isqb017sf"; depends=[compare ggplot2 shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; - EBMAforecast = derive2 { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; }; + EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; }; EBS = derive2 { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; }; - EBglmnet = derive2 { name="EBglmnet"; version="4.0"; sha256="052383c8pw4dkzp3q229fv0sznp1ykpsp42y2rv59lswa4q7pwgr"; depends=[]; }; + EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; }; + ECctmc = derive2 { name="ECctmc"; version="0.1.0"; sha256="09m0hfiji488nkk5b6dbylk5a06a27gzrzaa81v8gfb5mp7vy890"; depends=[Rcpp RcppArmadillo]; }; EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; }; EDISON = derive2 { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; }; EDR = derive2 { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; EEM = derive2 { name="EEM"; version="1.0.4"; sha256="15rs8bfpfz97q133fas21ghgyppw1rl526fs1dxmhn64bvzsr37j"; depends=[colorRamps R_utils readxl reshape2 sp]; }; EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; - EGRET = derive2 { name="EGRET"; version="2.3.1"; sha256="0wgrkb8l0iafbw78f3kkv9c0ab5ng5rnnhin6i015ckqab80h4rc"; depends=[dataRetrieval fields lubridate survival]; }; + EGRET = derive2 { name="EGRET"; version="2.4.3"; sha256="07b68jk2jakacdcs4siy4smq4d5afjckq5xas1aqq42nzwqlfz65"; depends=[dataRetrieval fields lubridate survival]; }; EGRETci = derive2 { name="EGRETci"; version="1.0.0"; sha256="1pz0l59hm7yy30p6albx3b4nm1qfbphj9jkz79a5mljk1fx8dbrz"; depends=[binom EGRET lubridate]; }; EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; }; - ELT = derive2 { name="ELT"; version="1.4"; sha256="080m00a63a4i2mz11nfna2yzj6wbn1nq4zmpf5a1xbfj518vc44a"; depends=[lattice latticeExtra locfit xlsx]; }; + ELT = derive2 { name="ELT"; version="1.5"; sha256="1nrq3dmlgh793ax12a1bm85h5kcrs99qjxiqa1qp9caq4zr3mzdg"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; }; EMA = derive2 { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[affy AnnotationDbi biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; - EMCC = derive2 { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[EMC MASS mclust]; }; EMCluster = derive2 { name="EMCluster"; version="0.2-5"; sha256="0nzbpx5pl414bpdqhfr4zv3gkrd77ifl1ysb4acw4h7f92hcd4lh"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; - EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; }; + EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; }; EMMIXcontrasts = derive2 { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; }; EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; }; EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; }; @@ -585,11 +618,11 @@ in with self; { EMP = derive2 { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; }; EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; EMVC = derive2 { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; }; - EMbC = derive2 { name="EMbC"; version="1.9.3"; sha256="189kgp6qv9dl4q1sirm3v9zqk11259il6ykb0008nnghv78rdcyd"; depends=[maptools mnormt move RColorBrewer sp]; }; - ENMeval = derive2 { name="ENMeval"; version="0.2.0"; sha256="0jy7a21av6ansx8r9bh7appsdjspzqnj13xk0vn5smgq3gkljg64"; depends=[dismo doParallel foreach raster rJava]; }; + EMbC = derive2 { name="EMbC"; version="1.9.4"; sha256="1an5585sfc0h5vxd964d28yz6awbx4bbfzaia0v90jmkf9k0apca"; depends=[maptools mnormt move RColorBrewer sp]; }; + ENMeval = derive2 { name="ENMeval"; version="0.2.1"; sha256="1m0h0zi3bxyabj1lq4jh3sbfiy9lbzgxafmy9j4nii7n1f7pf3rq"; depends=[dismo doParallel foreach raster rJava]; }; ENiRG = derive2 { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; }; ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; }; - EPGLM = derive2 { name="EPGLM"; version="1.1"; sha256="0bgxrli2gxnq4jx43iimzsq1abg1az35fjlkx2i0qkmacqw9bhq6"; depends=[BH MASS Rcpp RcppArmadillo]; }; + EPGLM = derive2 { name="EPGLM"; version="1.1.1"; sha256="1lbzp36lbk9gnbrqxyxgrdrn8rmi5vdxnqxpqdfd09dck263gy6p"; depends=[BH MASS Rcpp RcppArmadillo]; }; EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; }; ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; @@ -597,6 +630,7 @@ in with self; { ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; }; ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; }; + ETAS = derive2 { name="ETAS"; version="0.2"; sha256="0vj2ghxs43x81p0zmz2z52mlibs6rmqizd5ydhs382w689krhr80"; depends=[maps spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; @@ -613,32 +647,33 @@ in with self; { EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; - EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[editrules Rcpp]; }; + EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.1"; sha256="0c2gagvih77a0k0lg42xipmd396fdpwjabc1syyb3i16b853xggm"; depends=[editrules Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-1"; sha256="1lqgvs75airbmmwqhf6zfw1mpvy9dj51f92jx78mkp35ynnlny1i"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; - EffectStars = derive2 { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; }; + EffectStars = derive2 { name="EffectStars"; version="1.6"; sha256="0chwbvsjfq6flxrbwfm141rnky9b8l1b0scqxxxijyrw4y0f4a8z"; depends=[VGAM]; }; EffectTreat = derive2 { name="EffectTreat"; version="0.2"; sha256="0az4ajqq98adxrr1wj8pkv16f2g4gg3dikizvp7qa1amcnpahjx3"; depends=[]; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; }; EloChoice = derive2 { name="EloChoice"; version="0.29"; sha256="1r54laim7i8hzgyir47xq7qw8hxzsdw1ss10sljq1rm2lpsci6wk"; depends=[Rcpp RcppArmadillo]; }; EloRating = derive2 { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.1.0"; sha256="0l5xmsldc33v6y7f4s6a182axgm2p68nymx5hbj5bb09dxjbb9gg"; depends=[ggplot2 MASS]; }; EnQuireR = derive2 { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; - EnsembleBase = derive2 { name="EnsembleBase"; version="0.7.1"; sha256="1yc5afim7zprxvnk5r2m0wwrl15b8sifxnh00b1x7qnzyz4glfl2"; depends=[doParallel e1071 foreach gbm kknn nnet randomForest]; }; + EnsembleBase = derive2 { name="EnsembleBase"; version="1.0.1"; sha256="0vyg4lhal05s0fjz21pdk144a3j06594jalcmic1y6adq7dc2inq"; depends=[bartMachine doParallel e1071 foreach gbm glmnet kknn nnet randomForest]; }; EnsembleCV = derive2 { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q7k5ph5sf9zriazgfby376v1zjm82r93y4samsf"; depends=[EnsembleBase]; }; - EnsemblePCReg = derive2 { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; }; + EnsemblePCReg = derive2 { name="EnsemblePCReg"; version="1.0.0"; sha256="16k7ki8qq9bci46dga6visrpccia5rhlv3zq4jj936wkl3q28288"; depends=[EnsembleBase]; }; EnsemblePenReg = derive2 { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; }; EntropyEstimation = derive2 { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; }; EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; }; - EnvNicheR = derive2 { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; }; + EnvNicheR = derive2 { name="EnvNicheR"; version="1.3"; sha256="1j5r6nv1m1jc76jz45snxc2cidm8cxcx11dv4k4hk46bmp60iq7p"; depends=[IDPmisc]; }; EnvStats = derive2 { name="EnvStats"; version="2.0.2"; sha256="0lr6znl1cz7a08h31r3r095mlhdgwknj469vd7mb1y95807y8g38"; depends=[MASS]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; - Epi = derive2 { name="Epi"; version="1.1.71"; sha256="082q5y4g05gw9w8iq1bjfhiazwb50safh43wkl884a9h0srckjv9"; depends=[cmprsk etm MASS survival]; }; + Epi = derive2 { name="Epi"; version="2.0"; sha256="04ahl3hvbzjx56c063crq52jmcp5vil5h95bk2vzf4xifhxalspm"; depends=[cmprsk etm MASS plyr survival]; }; EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; - EpiModel = derive2 { name="EpiModel"; version="1.2.2"; sha256="1dp0n31aydq556k76xmz07rbrcpqzpcppq7s7q87pwy4ywid04xb"; depends=[ape deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; }; + EpiModel = derive2 { name="EpiModel"; version="1.2.5"; sha256="1wydqifaw4kh6lfhapiar2xv2r1bcccb6j6kcmd5cppr2hsl2agc"; depends=[ape deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; }; EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; @@ -646,14 +681,15 @@ in with self; { EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.0"; sha256="08m7igh6n8haf8yi8ikrz6ih4agvsnx415kdx4cgjw4xilvgpgqm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; - Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.7"; sha256="1zgarrf1a4vfy730w9ikv9mkxj9ql2qgs6ad9wwkvz8p0lwbqs7d"; depends=[zoo]; }; + Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.8"; sha256="135lsn8d5zwk7fljj9ccw7c0bnkddwdfdbjj8af21z5hnm3kl2lx"; depends=[zoo]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; + Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; ExactPath = derive2 { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[lars ncvreg]; }; ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; }; - ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.6"; sha256="1zm42v8ki2nn095sl4q1a69nbcf2xffc8092n85y3mbza4ymm4w9"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; }; + ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.8"; sha256="1vg5lqbk30gm3dq0hn6nihzxa7a1jqnfvm18r2w8dckc576ns6hf"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; }; ExpDes = derive2 { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.0.2"; sha256="00hw95k64p7zwb9a9n89cyghb8l6rrh33xlciw6g2q1dcmdfxzqg"; depends=[CORElearn semiArtificial]; }; @@ -672,12 +708,13 @@ in with self; { FBFsearch = derive2 { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; - FCMapper = derive2 { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; }; - FCNN4R = derive2 { name="FCNN4R"; version="0.6.0"; sha256="1ciqw5pfqq6gnf5k7s08a42gdn2c0z3x4glmm49j7qq4zwg2l7i6"; depends=[Rcpp]; }; + FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; + FCNN4R = derive2 { name="FCNN4R"; version="0.6.2"; sha256="089vq8kaag4j6xl3h9pb3ch8lfg0mmi96jgm4xhgr40rr0m3ijma"; depends=[Rcpp]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; - FDboost = derive2 { name="FDboost"; version="0.0-8"; sha256="1xvyndbfd0df6ld7r6f6ajr7i6aql26n9j5ncn6rw5gm0f64s1lq"; depends=[MASS Matrix mboost mgcv zoo]; }; + FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; + FDboost = derive2 { name="FDboost"; version="0.1-0"; sha256="01khx996wx0jk14dgzwy9ma38sdzxmspiw31rcqd6c26nzddsycs"; depends=[gamboostLSS MASS Matrix mboost mgcv refund zoo]; }; FENmlm = derive2 { name="FENmlm"; version="1.0"; sha256="0mq1qa72hsz3pyqjnbyzcc7shr08cq3hng1fz53mn9mvp11vb135"; depends=[MASS Matrix numDeriv]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; @@ -694,6 +731,7 @@ in with self; { FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp]; }; FME = derive2 { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[coda deSolve MASS minpack_lm rootSolve]; }; + FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; }; FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; FNN = derive2 { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; }; FPDclustering = derive2 { name="FPDclustering"; version="1.0"; sha256="078vvpn9lwza45l9k53m3yzhrkkyakm1ynm93x5yld4fgkrd3c33"; depends=[ThreeWay]; }; @@ -701,9 +739,10 @@ in with self; { FRAPO = derive2 { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; }; FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; }; + FREGAT = derive2 { name="FREGAT"; version="1.0"; sha256="0fq431iclhp2jjfm3330sw0b73sl9bmzq35sa5nfyk19cg2s18z8"; depends=[Matrix]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; - FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.1.3"; sha256="1as5b19pri5ib88g8cxbgs70zdsz24nqw6979z744vcgvzqk8gvv"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; - FSA = derive2 { name="FSA"; version="0.8.4"; sha256="1zj8d5543jf1hnm9bf7ns29l877plw5skfsl30268l1azrzsw1lb"; depends=[car dplyr gdata gplots Hmisc plotrix plyr sciplot]; }; + FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.0"; sha256="18hgdxwfk59rd2pbkr0pxjb0d27x81sw7vwky66hvcdzywkdcia8"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; + FSA = derive2 { name="FSA"; version="0.8.5"; sha256="1hnaq11i72zyq7v3d35v8m8ir59l5hmdws586c4dd8qykbzkqdlr"; depends=[car dplyr gdata gplots Hmisc plotrix plyr sciplot]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.2"; sha256="1g682bj7xiaqcs6ax8jyg02lvx5c1qk0v6a6w0ma3f0qyk6ga7aq"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Matrix Rcpp]; }; FSelector = derive2 { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[digest entropy randomForest RWeka]; }; @@ -712,23 +751,24 @@ in with self; { FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.1.2"; sha256="0wg8n2vn586dj5g6js6c7rshsjibciyvg2j53mxgnn0f63xdb3ip"; depends=[ade4 xtable]; }; - FactoMineR = derive2 { name="FactoMineR"; version="1.31.4"; sha256="0idqs5szvvyzxl2grc8v0iqayvqy90q4nhzqs6g058fgd6nwhslz"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; + FactoMineR = derive2 { name="FactoMineR"; version="1.32"; sha256="1b7v350l2c3swlpqjsc9gh4aiahzqm8kkk9nhc8y4s591xn1rqdv"; depends=[car cluster data_table dplyr ellipse flashClust knitr lattice leaps MASS scatterplot3d]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; }; - Familias = derive2 { name="Familias"; version="2.3"; sha256="18lh59y0msvilrdk1i6z2ycb5vclc37dkhn0ylry6285bbiyqvw6"; depends=[kinship2 paramlink Rsolnp]; }; + FamEvent = derive2 { name="FamEvent"; version="1.1"; sha256="1z4dvsj0c07il6gj0nhdhy1ss07c0zbraf0gg0hz288k3j756c2v"; depends=[kinship2 MASS survival truncnorm]; }; + Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; - FastGP = derive2 { name="FastGP"; version="1.1.2"; sha256="0awkapv9d1sc8kh0sz2f3jc6gkf3wmsa4bcic543ak1pi0h5chii"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; + FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; }; - FastImputation = derive2 { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; + FastImputation = derive2 { name="FastImputation"; version="1.3"; sha256="1x4qai8dycq5pk0q0s34yig30fxxw6vxw3cp87w361640ix95iqk"; depends=[]; }; FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; FastPCS = derive2 { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive2 { name="FastRCS"; version="0.0.7"; sha256="1pszpmb5qki4cchd1pc0j6s4sfflaikbfrbisf6c2j9p8ssxxfgk"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; }; - FatTailsR = derive2 { name="FatTailsR"; version="1.5-0"; sha256="188b0dwh96hgqk31kcbzljwm0br6ld2dqaaci85cqpihlc6vddl5"; depends=[minpack_lm timeSeries]; }; + FatTailsR = derive2 { name="FatTailsR"; version="1.6-0"; sha256="0713cgnwail2z404pn0fnpkbiw1fgc1ndh2krd0if2vnd2ibzgih"; depends=[minpack_lm timeSeries]; }; FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; }; - FedData = derive2 { name="FedData"; version="2.0.2"; sha256="1b1kpm4zhh2rxjwgpms1cd9blmladgpjc1gfjdl1yra279j8l74l"; depends=[data_table devtools Hmisc igraph raster RCurl rgdal soilDB sp]; }; + FedData = derive2 { name="FedData"; version="2.0.8"; sha256="14g9hqb6jwk3m9zyf05rzzbqfxzphb4vymjq6bz2j2ra598p7wyg"; depends=[curl data_table devtools Hmisc igraph raster rgdal soilDB sp]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[geoR mapdata maps proj4 sp]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.4"; sha256="0cg2vivshwcqyzlahsirh9jax4nr8alwz7gf4qxcdmxvzjaln6lq"; depends=[data_table devEMF plyr png sqldf stringr]; }; FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; }; @@ -745,6 +785,7 @@ in with self; { FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; }; FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; }; + FlowScreen = derive2 { name="FlowScreen"; version="0.9"; sha256="165zhlnirkmmnmxq9wcikz1ray6fswlv3nba14vr9q8ba9z359wv"; depends=[changepoint evir zyp]; }; Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; }; @@ -757,14 +798,15 @@ in with self; { FrF2 = derive2 { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.0"; sha256="12v72zn1san2kv82b9y1vd0gzd1fa800yscc63zlq8lfflz47xvz"; depends=[]; }; - Fragman = derive2 { name="Fragman"; version="1.0.2"; sha256="19yx8rbxy64m3jqbrjqkdd9jn6yfzx9a3n68727d8g29qan1mkxx"; depends=[]; }; + Fragman = derive2 { name="Fragman"; version="1.0.3"; sha256="0ar6nikfqcgv95xr0kbdwyiwc66a6rgrnnybhpk0fcrpkkjvzkm9"; depends=[]; }; Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; }; FreeSortR = derive2 { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; }; - FunChisq = derive2 { name="FunChisq"; version="2.1.0"; sha256="0k5b0kl64yswl5d41yiav9xnqcsqx8n6qc5p2nz5vqjs6qb7mbvd"; depends=[BH Rcpp RcppClassic]; }; + FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; + FunChisq = derive2 { name="FunChisq"; version="2.2.2"; sha256="1wfj42ibzk8riana50yv7r7fl78nggpgmgwn9q2qyrbr1413jj2b"; depends=[BH Rcpp RcppClassic]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; }; Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; }; - FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase]; }; + FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; }; FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-3"; sha256="1c7yynrz0vfvan9mfin2vsrkhhi3sy8c5nya7l8hja0nh1a4bzki"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; @@ -778,10 +820,11 @@ in with self; { GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; + GAMens = derive2 { name="GAMens"; version="1.2"; sha256="1x1q6a5p2lsx0gbfm976ps4braqaxa26ii6g3iag9ssafyhb0r1f"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; }; - GAabbreviate = derive2 { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; }; + GAabbreviate = derive2 { name="GAabbreviate"; version="1.2"; sha256="1q3m3srkh1zzrfxnl1hbhg4imml8zibd6vhshvwnbhz7pqyplzn9"; depends=[GA psych]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; }; @@ -792,35 +835,38 @@ in with self; { GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GEOmap = derive2 { name="GEOmap"; version="2.3-8"; sha256="14nar0djn8jzcyv0aij79xr3iqbgllrpcnfazi865plfa5ah7k9v"; depends=[fields MBA RPMG splancs]; }; - GERGM = derive2 { name="GERGM"; version="0.6.2"; sha256="0svnx3bdacyy2hhyw8h40z7gskk5brh1mbbp5kxgjwcc6zz61fhy"; depends=[BH ggplot2 igraph plyr Rcpp RcppArmadillo stringr]; }; + GERGM = derive2 { name="GERGM"; version="0.7.4"; sha256="02r5gkyhdqkcq1q1g9xg595riny77mdifx7maj0agby5jm49y3x0"; depends=[BH coda ggplot2 igraph plyr Rcpp RcppArmadillo stringr]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; - GFD = derive2 { name="GFD"; version="0.1.2"; sha256="1m6ygwvxp74nn5wmpmwb0xszc7a9q62gqfgd9hkdfp6xnnm54x73"; depends=[magic MASS Matrix plotrix plyr RGtk2]; }; - GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; }; - GGIR = derive2 { name="GGIR"; version="1.2-1"; sha256="03mmx7rmz5qah0853xn4slzkz0jkaq62zj69ydrk9gif84z6lgli"; depends=[]; }; + GFD = derive2 { name="GFD"; version="0.1.4"; sha256="1id4c07b061sjkvigl88zk6bv10brclcsz32z43dbp49xjd5x6nl"; depends=[magic MASS Matrix plotrix plyr RGtk2]; }; + GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; + GGIR = derive2 { name="GGIR"; version="1.2-2"; sha256="186yp8314ygsz5w3zrv76jswh79s5laglnw2lair69ib7d94bsh1"; depends=[]; }; + GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-10"; sha256="0ihxxih5fw470pnmnljsarahd4xim6ncx3w7fym5i5q86bqcyahb"; depends=[gtools lars mvtnorm]; }; - GGally = derive2 { name="GGally"; version="1.0.0"; sha256="0vrfaanlxsnrdsx7rbsnq01m61qib2skmzbzhisb447snq3qjfi5"; depends=[ggplot2 gtable plyr reshape]; }; + GGally = derive2 { name="GGally"; version="1.0.1"; sha256="1wradjcphk6mr817lnk3q3rbingn8xrsrprsxh0mv4w8g0wcibif"; depends=[ggplot2 gtable plyr reshape]; }; GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; GLDEX = derive2 { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; }; + GLMMRR = derive2 { name="GLMMRR"; version="0.1.2"; sha256="0mvldp1vf15pga0c7awf4xi431nh16rzcl0895pn728x30g2pk8d"; depends=[lme4]; }; GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; }; GMCM = derive2 { name="GMCM"; version="1.2.2"; sha256="1zvhbxz1bli460c9nh2p3vx7v3a5w2jwyyyd7r8dqgxpf3xr1pzw"; depends=[Rcpp RcppArmadillo]; }; GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; - GMDH = derive2 { name="GMDH"; version="1.2"; sha256="0b2vidcv78c9bnqwassn8yhk4lpn0l0pcz4rvm1vlfablg0xig79"; depends=[MASS]; }; + GMDH = derive2 { name="GMDH"; version="1.3"; sha256="0a4n98247r5a7j8p63ih9845gwfik59j9qh604hjw16gwvb7g8n2"; depends=[MASS]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; }; GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; + GORCure = derive2 { name="GORCure"; version="1.0"; sha256="0jkhhawbaihqb0kk6l4g5m65nfbww5fmr1hh7bgsnbsy0qv6hfp0"; depends=[ICsurv MASS pracma survival]; }; GOplot = derive2 { name="GOplot"; version="1.0.1"; sha256="0i4b26wkgf77z515027bmq5pqd21bhg0qrg6jbmwiv59nczr146b"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; GPC = derive2 { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; }; GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; - GPareto = derive2 { name="GPareto"; version="1.0.1"; sha256="0wscalc855c99yzy3q154rxvhg0xmzy4a4x37jkf8f45n8sgviif"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; + GPareto = derive2 { name="GPareto"; version="1.0.2"; sha256="05q2r51byzxj5jrxbpw1zicm3jc2vx4lqibhspbq61hxbsg6hy4m"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; }; GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; GPvam = derive2 { name="GPvam"; version="3.0-3"; sha256="0dmws29ahbjhx82s2i8jfzhl8pp5q201a592w90jvhwy2bnm1ywk"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; @@ -828,7 +874,7 @@ in with self; { GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; }; GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; - GSE = derive2 { name="GSE"; version="3.2.3"; sha256="1pxclcjz118dxypfgz3faagk6yqsj619wzmxd7cfraza797vy8xy"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; }; + GSE = derive2 { name="GSE"; version="3.3"; sha256="162k50lq7q4fs004d20x2fjnrfm21i33lmdqx6cc59xxpbwgcflx"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; }; GSIF = derive2 { name="GSIF"; version="0.4-7"; sha256="1c2lk6yzacwrxvs5v0al8hwvi7ncqdvn4f7ngicy6g8iyi4p7z08"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; @@ -841,20 +887,21 @@ in with self; { GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; - GWRM = derive2 { name="GWRM"; version="2.0"; sha256="1dfrwxr12dn6i39mv6i3j6k341f9rvd76skh0350jn6zx1cdkj9k"; depends=[SuppDists]; }; + GWRM = derive2 { name="GWRM"; version="2.1.0.1"; sha256="1hnnk2p0h8ssg5izqb8lplbpbcldqhfahxv0wkbw5cqyc7ydblak"; depends=[doParallel foreach]; }; GWmodel = derive2 { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.0"; sha256="0p5zz1waffynnciq1mbjjlnmaif1fnr5799y6izk50ckhh07bgfs"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; Gammareg = derive2 { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; + GeNetIt = derive2 { name="GeNetIt"; version="0.1-0"; sha256="102hq4w94gd7rz80cz1bll9kfblyacsk4h54yjflvqkmrs9x0d2b"; depends=[nlme raster rgeos sp spatialEco spdep]; }; GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; }; GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - GenCAT = derive2 { name="GenCAT"; version="1.0.1"; sha256="1a6jjfynngcqqacmn8lpjyvm4681n691savz768g0xq7mf4cmijw"; depends=[doParallel dplyr foreach ggplot2]; }; + GenCAT = derive2 { name="GenCAT"; version="1.0.2"; sha256="1najc2261v7l1s2axax2cycz3x2b04hzxsnyq7877346z85sc5vc"; depends=[doParallel dplyr foreach ggplot2]; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; - GenSA = derive2 { name="GenSA"; version="1.1.5"; sha256="10fkb30p3ncswlq4f9jknfhrrsi4v3lkn2nlnpb2yhrqai538wij"; depends=[]; }; + GenSA = derive2 { name="GenSA"; version="1.1.6"; sha256="1llhjhg39fd2pnm6kn8zjhw6kkg88wn7y3yizr8fna7qc3ixlcii"; depends=[]; }; GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; @@ -873,20 +920,20 @@ in with self; { GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.1"; sha256="05fwlzzjnl84rv6r2hlqkhhg1y0d4yxmk5w4fpxfc7lpz2zi3zcd"; depends=[GlobalOptions rjson]; }; - GhcnDaily = derive2 { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[abind ncdf R_methodsS3 R_oo R_utils]; }; GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; }; + GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; + GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0"; sha256="0dd4w7b3l9i78c9qvw2akz3h8annknbpfd3f56bgyw3gcfdrrz0x"; depends=[]; }; Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; }; - GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.8"; sha256="1kj88y1rqq4hd9a5l9aiasj3zhs8bf8b5l9xh59bfas66jwkrlj9"; depends=[]; }; - Gmisc = derive2 { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp]; }; - GoFKernel = derive2 { name="GoFKernel"; version="2.0-6"; sha256="11x9xvgrb7si2y6s2cgxgk01j0laizjqddbqmmj37ylmnh0539mw"; depends=[KernSmooth]; }; + GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.9"; sha256="1c08rfy8vxay4zrf91r7cxf70w3g35c7mxc6k9wkc2y948jnpj7i"; depends=[]; }; + Gmisc = derive2 { name="Gmisc"; version="1.3.1"; sha256="1gwg1600nyabrs6j721246cnrk9ishj7sc904mqxlbgcp5dxp4s1"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; }; + GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; }; Goslate = derive2 { name="Goslate"; version="1.0"; sha256="1pccrpvav5mbh52vdsqvdrshdaa4wvb7m0wc7lkd82k4661fa1qc"; depends=[PythonInR R6]; }; - Grace = derive2 { name="Grace"; version="0.1.1"; sha256="19333dg0dgijkqh3xq2aawy4d6qagm64mmahns4j9ykdqjvpb1vg"; depends=[glmnet scalreg]; }; - GrammR = derive2 { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; }; - GraphPCA = derive2 { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[FactoMineR ggplot2 scales scatterplot3d]; }; + Grace = derive2 { name="Grace"; version="0.2"; sha256="1ra1k0mpzcss3n5npqlphr1vl69c6x4c47agc7qxrzarryhk973w"; depends=[glmnet scalreg]; }; + GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; }; GrapheR = derive2 { name="GrapheR"; version="1.9-85"; sha256="16x1j3nfkcjszbfp9j3vg5sprdz5991f7j7v14cdwypcyl35yghh"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[rgeos sp]; }; @@ -894,7 +941,7 @@ in with self; { GroupSeq = derive2 { name="GroupSeq"; version="1.3.3"; sha256="0abb18w9jylb1nf6yc6xic6b01f8zfxsm8hsmxk4whivn17ckfp9"; depends=[]; }; GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.0"; sha256="0wcscyrkxl1sxhzgm35x2zh94lmnhvj16x77k9vhscc7j8as5d90"; depends=[Rsolnp truncnorm]; }; - GuardianR = derive2 { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; }; + GuardianR = derive2 { name="GuardianR"; version="0.6"; sha256="154fp4dx14v43c8ch6b7jaxwwnb0fgqiihm9m4qjywhqm8ask6na"; depends=[RCurl RJSONIO]; }; Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-4"; sha256="1cywcrj1iz46p2l0f99msgbipicc53ly5j5mzpaspq8wn8f4fwf0"; depends=[copula numDeriv]; }; @@ -903,13 +950,14 @@ in with self; { HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; }; HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; }; HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; + HDInterval = derive2 { name="HDInterval"; version="0.1.2"; sha256="02rjqja2bcxc97hb6fg2xjxxkljsdv0g84qww39jq1pvgkswmm4g"; depends=[]; }; HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; }; - HDPenReg = derive2 { name="HDPenReg"; version="0.92"; sha256="1kzvxcjhjbl5gz1n6jfj1vs6wbj3lvk3b3sirj7x04v0m2052lip"; depends=[Rcpp rtkpp]; }; + HDPenReg = derive2 { name="HDPenReg"; version="0.93.1"; sha256="1av4x9xqf4y1qfdkh9f0msskj9fqimng1i9bdlgl2ycfn8a64cjp"; depends=[Matrix Rcpp rtkore]; }; HDclassif = derive2 { name="HDclassif"; version="1.3"; sha256="1b80dnaa6m4px0ijpd9yf45v8jl0b9srcmrdyar8fs7lxpc53k2l"; depends=[MASS]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; }; - HH = derive2 { name="HH"; version="3.1-24"; sha256="05z8bbyz7pgwd2vz2cc36j1r2v03m97ac6qc3hwg388mm0vy1xpr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; + HH = derive2 { name="HH"; version="3.1-25"; sha256="0lrli7rci0m9xb3fx51m59mcikyfhzsjmjp5s59ilahz70gkxnnw"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="1.5.1"; sha256="111b3lqkp8z7m3g4vgmd0dcplkm4szfwa620sxy70084qad1jv4d"; depends=[]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; @@ -921,8 +969,8 @@ in with self; { HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; HMMpa = derive2 { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; - HMP = derive2 { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[dirmult MCMCpack]; }; - HMPTrees = derive2 { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; }; + HMP = derive2 { name="HMP"; version="1.4.3"; sha256="15fsyk61y141wdkc5cjrw05gc5kzl2a8cmk2n54c8gmhhjbjy692"; depends=[dirmult doParallel foreach gplots MASS]; }; + HMPTrees = derive2 { name="HMPTrees"; version="1.3"; sha256="1q0zfwhzfr45mykql8hsp6pzkfhcplr7gkq7dbd8xa97wxsf63yd"; depends=[ape dirmult doParallel foreach HMP]; }; HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; HRM = derive2 { name="HRM"; version="0.1"; sha256="12pjsy9hx0sz42czfwvsla6pyp85as4pf2hhvbh0yp07wwfs2f3i"; depends=[MASS matrixcalc]; }; @@ -938,8 +986,9 @@ in with self; { HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; + HWxtest = derive2 { name="HWxtest"; version="1.1.7"; sha256="030fl88bj0g7y9b9kd56bnxh0cad6y84bnmvsgwlanb51n3ggz3w"; depends=[]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; - HandTill2001 = derive2 { name="HandTill2001"; version="0.2-10"; sha256="02y18dwz06wba4a3d247ib2csgjpw6i67fh5np2fla00qw0f8qc9"; depends=[]; }; + HandTill2001 = derive2 { name="HandTill2001"; version="0.2-11"; sha256="1vv3vm1hlfibgw84y52nzb5a66jigbmx3611lf4kmqfl1y4wm3rg"; depends=[]; }; Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; }; HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; }; Haplin = derive2 { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; }; @@ -947,7 +996,7 @@ in with self; { HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; }; HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; - HelpersMG = derive2 { name="HelpersMG"; version="1.3.2"; sha256="0v6mlxd7lxbj4z5a7dr5jfrnm4qjwgkc7ipkby5lb6h26c0lmdpp"; depends=[coda]; }; + HelpersMG = derive2 { name="HelpersMG"; version="1.4"; sha256="1wi74b58ya9395wqk3hgs7nddd6mpamal9258gf2wy0s57wmcwr7"; depends=[coda]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.0"; sha256="0azr6n792dmkg12ynr3nybmb33z8rv046lv0hfwpyybz6p8dj3zq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; @@ -958,18 +1007,18 @@ in with self; { HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-4"; sha256="1w3j4dnf6ay0a17kn8zdzy38wind4pqfnwlndf9m9fj8m2scaay8"; depends=[]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; - HistDAWass = derive2 { name="HistDAWass"; version="0.1.3"; sha256="09zg7yrw0zdgy7v6z9awysshks618jiqx01fasi8qb9wrdisvf74"; depends=[class FactoMineR ggplot2 histogram]; }; + HistDAWass = derive2 { name="HistDAWass"; version="0.1.4"; sha256="00jdfv3ij9v431wm1grib9pcr9nfn42r2hjvjj12b61r2v7j2b1n"; depends=[class FactoMineR ggplot2 histogram]; }; HistData = derive2 { name="HistData"; version="0.7-6"; sha256="1wazqpgjzl5x2whn9v54yx83xw0pd0l03h6rqv6dp25xizxlxw0v"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; - HiveR = derive2 { name="HiveR"; version="0.2.44"; sha256="1ckbgn4vmv35bssbjrgvqhsx7ihm40ibpnxqwwsw6bv7g6ppx3ch"; depends=[jpeg plyr png RColorBrewer]; }; - Hmisc = derive2 { name="Hmisc"; version="3.17-1"; sha256="18y3bgdlv12qgqyjmayn9zxd0v6bpgq7bgdkfkmzjgm1phwry7g4"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet rpart survival]; }; + HiveR = derive2 { name="HiveR"; version="0.2.46"; sha256="1zc1vjb975y9icw9vq65f27nrj2n3c5lgms0alflj837b5zvbhqd"; depends=[jpeg plyr png RColorBrewer]; }; + Hmisc = derive2 { name="Hmisc"; version="3.17-2"; sha256="110w5hbrl10isslqs0iq6w2ll0dafqyqznb50cdcallnlnvbvxrg"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet rpart survival]; }; Holidays = derive2 { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; }; HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; }; HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; - HydeNet = derive2 { name="HydeNet"; version="0.10.0"; sha256="08aslx01vi2fi5kgjq6cfwhnlljz5xzpgfj5873c8wmm7rwbwpnf"; depends=[ArgumentCheck broom DiagrammeR dplyr graph gRbase magrittr nnet plyr rjags stringr]; }; + HydeNet = derive2 { name="HydeNet"; version="0.10.3"; sha256="0v3mkpyw2qfi3kywlpvr01vdvi78xcq2v43g90jrihzqrvrd6lm3"; depends=[ArgumentCheck DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; }; HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; }; HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; }; @@ -989,27 +1038,30 @@ in with self; { ICEbox = derive2 { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; }; ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; }; + ICGOR = derive2 { name="ICGOR"; version="1.0"; sha256="1lgpgxi9ps0dnxllc1095lvdaq5p0dz6w4daw2b7q6jk3m6v5cla"; depends=[ICsurv MASS pracma survival]; }; ICS = derive2 { name="ICS"; version="1.2-5"; sha256="0q69rhb8an200yi564jzqbfb8b83l6xddqxhk8kw4g3y96jp82qx"; depends=[mvtnorm survey]; }; ICSNP = derive2 { name="ICSNP"; version="1.1-0"; sha256="1g7n8jlilg36hm989s5x18kf8jqn5wy98xi9jmnqkqpds4ff217y"; depends=[ICS mvtnorm]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; }; - IFP = derive2 { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[coda haplo_stats]; }; + IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; + IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.0"; sha256="1sxwccysmxv9cv34rgi3s777734a01hmxyr7x32bgykkhjq6wr25"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; - IMP = derive2 { name="IMP"; version="0.1"; sha256="15mmy8fpcxsfjygirwkk9ifxdf25v9lklmnr999n98mx7h3gakkl"; depends=[dplyr ggplot2 shiny tidyr]; }; + IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; }; + IMak = derive2 { name="IMak"; version="1.1.1"; sha256="0s1pwpy9538gz108q74ld5azqskix4rk60bmr5qllpcqqhbwhrva"; depends=[]; }; INLABMA = derive2 { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[Matrix sp spdep]; }; IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; }; IPSUR = derive2 { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; }; IQCC = derive2 { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="1.0.1"; sha256="08jmkncz5nyjrcb07fgnv2siws6ihd1nzssq99bv5ab24v3krr0w"; depends=[IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; - IRISSeismic = derive2 { name="IRISSeismic"; version="1.0.5"; sha256="1mgb774bmy20c4dzisb7ij4xqz9jhajn384nb7sfcnz5khxznxc4"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; + IRISSeismic = derive2 { name="IRISSeismic"; version="1.0.7"; sha256="00qqg97kkc7yas7qiv6280rbjjdvmrp4w62kj0fps727hfbr6r51"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.1"; sha256="0izw7mk78b9ab2p6jb5vph80cjbaq0m6xvyw8xlzypa3j3ns17sv"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; ISLR = derive2 { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2016.03.15"; sha256="05dbmah7daxqmmljb4hx2f2pz2yii3k9mpg6p30fbs5rkn84pfkw"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.0.18"; sha256="1hh23d4dzhkqli68466gs2n6zhlhwjl53dvrpqvl6ag6i4x974ag"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; }; @@ -1022,16 +1074,16 @@ in with self; { ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; }; - InSilicoVA = derive2 { name="InSilicoVA"; version="1.0"; sha256="0rvd78p2vmp2d72fsh8fv8n1yd6ia4zw5p1ny6mfm18xrmp5x3v1"; depends=[coda ggplot2 rJava]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.1"; sha256="0zm0q82j5mdpjy7pa0dxx3291dh01q9c21gzjripmggb96fsg39d"; depends=[coda ggplot2 rJava]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; Information = derive2 { name="Information"; version="0.0.7"; sha256="1gri1szvwj4c27s7niz5ss8lws16q3sxxgaz7p9grcbhd5ky5apg"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; }; InformationValue = derive2 { name="InformationValue"; version="1.2.1"; sha256="0bbsix2w834jd64d1mgsjlbawrc73yykzd3zf5lwkfr5gka4k1ij"; depends=[ggplot2]; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; - IntegratedJM = derive2 { name="IntegratedJM"; version="1.3"; sha256="0yd1kbw5sym4gnz0h7fw25ay1j39djdarxrwvy8v4ai3hf8dx0zr"; depends=[Biobase ggplot2 nlme]; }; + IntegratedJM = derive2 { name="IntegratedJM"; version="1.4"; sha256="1r42zzrm5cmqlaxxzla0fwf5l34qjil9ndmv2cdwzw1kbqp84qz4"; depends=[Biobase ggplot2 nlme]; }; InterSIM = derive2 { name="InterSIM"; version="2.0"; sha256="0vzhrm02m44ckxla0q868nwskkldd5p008xfi3mgp5mh5iqgqpxv"; depends=[MASS NMF]; }; - InterVA4 = derive2 { name="InterVA4"; version="1.6"; sha256="0gapabbqsh01iya27kjs1zxk7rxvciw1z478s9g6av35vv0b6z0z"; depends=[]; }; + InterVA4 = derive2 { name="InterVA4"; version="1.7.1"; sha256="0qdfbvh6ab5w3ym1mydfq0cjimj8ydnh01aw69grhc4is43vr667"; depends=[]; }; Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; }; @@ -1044,7 +1096,7 @@ in with self; { Iso = derive2 { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; }; IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; - IsotopeR = derive2 { name="IsotopeR"; version="0.5.1"; sha256="1db15q1dxkadfbkc38vmkfmygmisk1rzjgv16pqjziyphcprn8f7"; depends=[colorspace ellipse fgui plotrix runjags]; }; + IsotopeR = derive2 { name="IsotopeR"; version="0.5.2"; sha256="1ny9drxhp547d9dhdlq78q3nqmril77x1ka6q809j9sklmpvx42q"; depends=[colorspace ellipse fgui plotrix runjags]; }; JADE = derive2 { name="JADE"; version="1.9-93"; sha256="0ryj7yiwgrz3cq8q5x6m2srlxxbm26gzs191gs4z9sbjk91vgcnp"; depends=[clue]; }; JAGUAR = derive2 { name="JAGUAR"; version="3.0.0"; sha256="0y4h2d4aw546ldwxs7rhpyb7hsby75h53b9vbkqz49105b8zai3j"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; @@ -1058,7 +1110,7 @@ in with self; { JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; - JRF = derive2 { name="JRF"; version="0.1-2"; sha256="0gpsmkaqd1r0yr7qgvfvwbqknmfngjkg26ihyz0y17n5cfpbvv1z"; depends=[]; }; + JRF = derive2 { name="JRF"; version="0.1-3"; sha256="1ljgmvsq8mjl01kl82g5qzp857wjm2zlg9qz4zgjqbawbs4p4s72"; depends=[]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.2-2"; sha256="1q6wqxlhslip14544px1aq446m77a8s0chvhpc19im014w4g930v"; depends=[Rcpp]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; @@ -1070,19 +1122,20 @@ in with self; { KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; - KFAS = derive2 { name="KFAS"; version="1.1.2"; sha256="18mv0azijcfl4gzalvrh0cavd6svjkr8mdnl9jl6bppvann4dri3"; depends=[]; }; + KFAS = derive2 { name="KFAS"; version="1.2.2"; sha256="06bkmb6gsh4lxjvmb9p5d143f1xkr9r6nlh4jmf9l297xwv35b7w"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive2 { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[class e1071 plsgenomics]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; }; KRLS = derive2 { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; + KScorrect = derive2 { name="KScorrect"; version="1.2.0"; sha256="1rymzllm97z22xwsn5wbn02c0xp0kfdp73mk9jrk81hfdpd15p4i"; depends=[MASS mclust]; }; KappaGUI = derive2 { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; }; KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; }; - Kernelheaping = derive2 { name="Kernelheaping"; version="1.2"; sha256="0pd6bqw290b24zp3qlx5pagrg027wm2ic6xkcjzz34n62f6dngrq"; depends=[evmix ks MASS sparr]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="1.5"; sha256="0wzvc537nq0b7dx7wy41gx3sq7ghvniwhz41ldi59gkqcah7ax8m"; depends=[evmix ks MASS sp sparr]; }; Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; }; KoNLP = derive2 { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; }; KoulMde = derive2 { name="KoulMde"; version="1.0"; sha256="0dz13j24kyvr8kxs5lyvbjxj8l4i8h4il16qjn7hdnmi39g4khr4"; depends=[]; }; @@ -1094,6 +1147,7 @@ in with self; { LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; }; LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; + LCMCR = derive2 { name="LCMCR"; version="0.4.1"; sha256="1pn11a0h4986wvllkpspymvh1qyi5vhpcz0qg7wa32jbla9is87s"; depends=[]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; @@ -1111,22 +1165,24 @@ in with self; { LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; LINselect = derive2 { name="LINselect"; version="0.0-2"; sha256="0pkp7xc766nzg5p739zlnjd075k3zlf6zj364hmv95cqlaym9292"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; - LLSR = derive2 { name="LLSR"; version="0.0.1.9525"; sha256="1jjy5s7rdjcj0hh7nhzhpxyy4yqx287p6r0rjck1sz29mk4h09jm"; depends=[digest rootSolve XLConnect]; }; + LLSR = derive2 { name="LLSR"; version="0.0.2.0"; sha256="0nxp1sfnhgf0iqfhwqvr7a0mvs3swsj2l0shcyrb3zliyd23g5ax"; depends=[digest ggtern rootSolve svDialogs XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; }; + LMest = derive2 { name="LMest"; version="2.2"; sha256="0ivsqc89zi6dxhkjnqakvm4da3vpn03lbid9m2aklf9b5jk06247"; depends=[MASS MultiLCIRT]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LOGIT = derive2 { name="LOGIT"; version="1.1"; sha256="07dz6pmzx1zxpgvfxx3v42iqas402bjr274hq601c9ibcsq3hlgs"; depends=[caret e1071 ggplot2 ggthemes MASS pROC reshape]; }; + LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; }; LOST = derive2 { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; }; LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; }; LPM = derive2 { name="LPM"; version="2.6"; sha256="0fr84l4qxr1ckjafw0i8g6fn74g8qavcs218g3wa03ckab0y98ps"; depends=[fracdiff MASS QRM]; }; + LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; }; LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; }; LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; LPmerge = derive2 { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Matrix Rglpk]; }; + LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; }; - LSAfun = derive2 { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlqf77zkxap22i9lid5db1bmqh9rpk9"; depends=[lsa rgl]; }; + LSAfun = derive2 { name="LSAfun"; version="0.5"; sha256="1f4bv7c7y0ydq2xddr1y4mhp8i9xnjbndvmqnpkvlj702dx63rdx"; depends=[lsa rgl]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; LSD = derive2 { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; }; LSDinterface = derive2 { name="LSDinterface"; version="0.2.1"; sha256="1n8ynb99avn6nlhfnl1k8yn5qywhgin67fzk7b7c4b2dd3bhjd3w"; depends=[abind]; }; @@ -1138,11 +1194,11 @@ in with self; { LW1949 = derive2 { name="LW1949"; version="1.0.0"; sha256="0icfgsh93f4i73p7wpacb6dsg4cdfh71l7rwhqknnifvb5nvp8sv"; depends=[MASS mgcv plotrix]; }; LaF = derive2 { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp]; }; Lahman = derive2 { name="Lahman"; version="4.0-1"; sha256="058rn595rnh2wl7qqrqd5smzzb486cn46lx2ifjc8nijm83lzhfx"; depends=[]; }; - LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[plyr rLakeAnalyzer]; }; + LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.4.1"; sha256="0bki7q1r3q80kg5kdxpig4lpzcy978zy9jx9mv40643idskrx2z3"; depends=[plyr rLakeAnalyzer]; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; - LambertW = derive2 { name="LambertW"; version="0.6.0"; sha256="0hivwdmzalhcm4786qlrw9fq96m55j0zswx5xymgxzqpkfn9hk5q"; depends=[lamW MASS moments]; }; + LambertW = derive2 { name="LambertW"; version="0.6.2"; sha256="0sl47s82mkkn2yhdppnh37fb6kb38ilzp6gn16jvl24jzcr7mjkn"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; Langevin = derive2 { name="Langevin"; version="1.1.1"; sha256="0zkd3ifv8w1szxf22740qn7cv7b0bahq988lbr14smkrm3qyq37v"; depends=[Rcpp RcppArmadillo]; }; - LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.3"; sha256="08xp1af259ibgjgln8p5g97i2zwf9id6r1vj48zw6nm5zc76l8ih"; depends=[orthopolynom polynom]; }; + LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; LatticeKrig = derive2 { name="LatticeKrig"; version="5.4-1"; sha256="1lbnrjsfc9yirg18qx8jc20f9xhymf125p3g4bqp3kqa1mcjzvxs"; depends=[fields spam]; }; LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; @@ -1151,7 +1207,8 @@ in with self; { LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.2"; sha256="0l1cd32kl0690n07f27dmjp5975zgv57zi3km5g3xjiq3lnk8hqr"; depends=[ggplot2]; }; LiblineaR = derive2 { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; }; - Libra = derive2 { name="Libra"; version="1.4"; sha256="140nn6nn179iy7hz04gcjrxp7a1yiidc6pz7majwcq38bjfys33f"; depends=[nnls]; }; + LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; + Libra = derive2 { name="Libra"; version="1.5"; sha256="1kd3d06qjswqhwdsjkijixd4yijzks8xcdrkpyh99dwg045fg9h7"; depends=[nnls]; }; LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; }; LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; }; LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; @@ -1160,8 +1217,8 @@ in with self; { LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; }; LinearRegressionMDE = derive2 { name="LinearRegressionMDE"; version="1.0"; sha256="0nl29l10y5kpds1i4sv7jwizq61fmh5c0zpj8x64qfif4l6y4v0d"; depends=[]; }; LinearizedSVR = derive2 { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; }; - LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.0.0"; sha256="0760p6xpqpfqg7fpxwzzdsnmd94zn85dghx6dgcj7j6s78hnsb2s"; depends=[]; }; - Lmoments = derive2 { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; }; + LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.1.0"; sha256="0dp4w8dk14vdrh3kgb6wqbc1j7nc86giajhfb1iv10mc72wplxm6"; depends=[]; }; + Lmoments = derive2 { name="Lmoments"; version="1.2-3"; sha256="13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79"; depends=[]; }; LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; @@ -1177,19 +1234,20 @@ in with self; { LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; Luminescence = derive2 { name="Luminescence"; version="0.5.1"; sha256="0jxx2ldcm814qbdqzgqc7gbf4ymaqyvzykbxzp2cfqhvg20rkh7s"; depends=[bbmle data_table digest httr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; + M4comp = derive2 { name="M4comp"; version="0.0.1"; sha256="1lxm6qcbdp7i00vxbikhyl7pdxnz4czar10kh9xm0qwy8sl8lxg2"; depends=[]; }; MAINT_Data = derive2 { name="MAINT.Data"; version="0.5.1"; sha256="12vxy2l7mjp4dalg59zp0rd8cy3548vdqpzdkiq2rhvf9fvymxzr"; depends=[MASS miscTools]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.14"; sha256="1f6g1ra2hvihdxqgydbh06azddx5m4rcvx2dzq9rh2fjnk1a0kpa"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MAMA = derive2 { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; }; MAMS = derive2 { name="MAMS"; version="0.7"; sha256="0ggww2260qgf51329a9vp0386i5mn3772aw56qwxyhbxyh7bkayw"; depends=[mvtnorm]; }; MAMSE = derive2 { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; }; - MANCIE = derive2 { name="MANCIE"; version="1.2"; sha256="0qxjy4f3qxvaa64qf4v7jp3ih5b6jxy2j105hdxm0p3642fgx9f4"; depends=[]; }; + MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; MAPA = derive2 { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; }; MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; }; MASS = derive2 { name="MASS"; version="7.3-45"; sha256="0bhxx8kxfvnacia50hx5s0ax13wk8fqfgxh30p676h0hi4y45k43"; depends=[]; }; - MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; }; + MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; }; MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; }; MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; @@ -1200,7 +1258,7 @@ in with self; { MAd = derive2 { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; }; MBA = derive2 { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[BH sp]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive2 { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; }; + MBESS = derive2 { name="MBESS"; version="4.0.0"; sha256="09sz3g78h584034v9xx8n03swnc01mabiavhryr0hcgsh2hdhz9i"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; @@ -1208,13 +1266,14 @@ in with self; { MCAPS = derive2 { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; }; MCDA = derive2 { name="MCDA"; version="0.0.12"; sha256="1lvnsv4x35wh8gzdjqql9rpzxx0x6jyrgm5bdlmak38l6gg3r87w"; depends=[glpkAPI Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.0"; sha256="0lajn4kv6hjxkrac08wvviws8lv6nnr70ibclm5cnwmvvaxfvn4d"; depends=[]; }; + MCI = derive2 { name="MCI"; version="1.0.0"; sha256="1p2qr9jf3zir7pccsw0fqy0f2ics177n4097r2wcwch86by47naq"; depends=[]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; - MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[ggplot2 MCMCglmm]; }; + MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.2"; sha256="1ii5ryb58z4xwg69mximdjmxamkwz6k2ydf6qkd1jcq50afjv0pp"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; }; - MCMCglmm = derive2 { name="MCMCglmm"; version="2.22"; sha256="1ami8x4gip15981hfvfban5pv2xg2mpdq6xn3b5wxzb0qrz3x5zs"; depends=[ape coda corpcor cubature Matrix tensorA]; }; - MCMCpack = derive2 { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; - MCPAN = derive2 { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[multcomp mvtnorm]; }; + MCMCglmm = derive2 { name="MCMCglmm"; version="2.22.1"; sha256="045qxdqq58jf5rrx8jxp8db8s2i9hdi5abvkmcz0hjh146gpgimf"; depends=[ape coda corpcor cubature Matrix tensorA]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.3-5"; sha256="1jjj6v1nhdwaf6g9w0npdn07s02m58vi3va8b2knwzb1z68cjrqq"; depends=[coda graph lattice MASS mcmc quantreg Rgraphviz]; }; + MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[lattice mvtnorm]; }; MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; MCS = derive2 { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; }; @@ -1222,9 +1281,11 @@ in with self; { MChtest = derive2 { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; MDM = derive2 { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; }; + MDMR = derive2 { name="MDMR"; version="0.3.0"; sha256="1135jvqbmh1811jw9ih0jvh7nv2d157yv7alwr8shlpx2vzlbbcw"; depends=[CompQuadForm]; }; MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[linprog Matrix]; }; MDR = derive2 { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; + MDplot = derive2 { name="MDplot"; version="0.3"; sha256="1p46ggriwjrjrkbv9xkhpjiivz1gml0c2anpfrm83y2y9is19z37"; depends=[gplots gtools MASS RColorBrewer]; }; MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; }; MESS = derive2 { name="MESS"; version="0.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet kinship2 Matrix mvtnorm]; }; @@ -1232,26 +1293,29 @@ in with self; { MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; MFAg = derive2 { name="MFAg"; version="1.3"; sha256="1f5kd5zvk28jd8km4py4msyv69700knj20db5c528f2j8sd8qavc"; depends=[]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; + MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; }; + MGLM = derive2 { name="MGLM"; version="0.0.7"; sha256="0wqwdx8gskrp2y04f947m0cvgd685n8g3wgggc8sv0ra7z2qzx9y"; depends=[]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.2"; sha256="0a465kali82x9c0hld8f1m285d7zw0cf93lps87amlj3ck0nhh8z"; depends=[MASS]; }; + MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0"; sha256="1hp0v7w611b9a4k7zck3zx15b0298z1i2vrl2w35nw74iqpicrhh"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; MIICD = derive2 { name="MIICD"; version="2.2"; sha256="16r3ry27iki32f2y4ic6w15fgr21wrs0qbiiyx23nqivvw8x4017"; depends=[MASS mstate survival]; }; - MIIVsem = derive2 { name="MIIVsem"; version="0.4.4"; sha256="0j4xa9nbkkdxszbdfc3cyh1jf1d3j1swzxr3y50szcjsd6bd0b6v"; depends=[lavaan Matrix]; }; + MIIVsem = derive2 { name="MIIVsem"; version="0.4.7"; sha256="1k0rfs5cm7n5xpk472mv74p3l2ic2y8vij6dfcv918jm5xsnz9sz"; depends=[lavaan Matrix]; }; MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; }; MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; }; MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; - MKmisc = derive2 { name="MKmisc"; version="0.99"; sha256="071vq4r3206v5bnb3cfar9g3hjgk8crqgs1ky7pzqcxyc439bdc0"; depends=[RColorBrewer robustbase]; }; - MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[limSolve MASS MultiLCIRT]; }; + MKmisc = derive2 { name="MKmisc"; version="0.991"; sha256="0zswd681rzhzaf51ij8szah1r8dix870k3rqajqbr60nw4ahnfip"; depends=[RColorBrewer robustbase]; }; + MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="1.1"; sha256="1zp50y0628f69jn0bqi9lw9qrhh9rq275xl2nl6hakhc1z6mqkj0"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; MLRMPA = derive2 { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; }; MLmetrics = derive2 { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; }; MM = derive2 { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; }; - MM2S = derive2 { name="MM2S"; version="1.0.4"; sha256="1av7nv5rrmzkg1cl8j2ngk09mx7pgxf2rchldz2jvwj80cq4ig66"; depends=[GSVA kknn lattice pheatmap]; }; + MM2S = derive2 { name="MM2S"; version="1.0.5"; sha256="0h10cbsdnndllwq4cb4aamjy104ckvn01skh7rixa1iqdndac9fx"; depends=[GSVA kknn lattice pheatmap]; }; MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; }; MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; }; MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; }; @@ -1273,16 +1337,16 @@ in with self; { MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; }; MRCE = derive2 { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; - MRH = derive2 { name="MRH"; version="2.1"; sha256="06pabl8262fbq13y7vb3hsqy98zh4zm301qjxry148ljx6sgp6xx"; depends=[coda KMsurv survival]; }; + MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; }; MRIaggr = derive2 { name="MRIaggr"; version="1.1.5"; sha256="0c0whxdwamli1m9xnhv9kdv7zcb0sprlhdxw3c7800s311xg0iq4"; depends=[Matrix oro_dicom oro_nifti RANN Rcpp RcppArmadillo RcppProgress ROCR spam]; }; MRMR = derive2 { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; }; MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; }; - MRS = derive2 { name="MRS"; version="1.0"; sha256="1l3q9ialfndrgi8ry3vqh5zkyfxy7717lhll07fs9arrs1ym6p3n"; depends=[igraph optimx Rcpp RcppArmadillo]; }; + MRS = derive2 { name="MRS"; version="1.1"; sha256="1bzw36ba2nzic0vsr7ipmf6d5vrglf9fhlppnw4q8y81q5jla3q2"; depends=[igraph optimx Rcpp RcppArmadillo]; }; MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; }; MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; }; MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; MSBVAR = derive2 { name="MSBVAR"; version="0.9-2"; sha256="1p6n8vbrlqqq1vbqvxnn0ffmnr462gslb1jkaf4vcrndbln5cclq"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; }; - MSG = derive2 { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; }; + MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSQC = derive2 { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; }; MST = derive2 { name="MST"; version="1.2"; sha256="1zx5gs6c8qa5b56c4z8zc96kggy5qc3fff9q7ki58zg36rbhi0wm"; depends=[MASS survival]; }; @@ -1291,18 +1355,19 @@ in with self; { MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; }; - MTurkR = derive2 { name="MTurkR"; version="0.6.17"; sha256="13rdynz7awyq2sf9qx739w1d5ybv5h353bgff4vdsk6waws7rw4s"; depends=[base64enc curl digest XML]; }; + MTurkR = derive2 { name="MTurkR"; version="0.7.0"; sha256="0hs5qj4ngjpwgm0wjhkdf68cpyvvmf1d49za3mighqpqzib9z36w"; depends=[base64enc curl digest XML]; }; MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; }; MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVN = derive2 { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; }; - MVR = derive2 { name="MVR"; version="1.30.2"; sha256="1mq1czz5ipfy19iismdxzrcirji3qvg4av3fabaach20pfdpbrzx"; depends=[statmod]; }; + MVR = derive2 { name="MVR"; version="1.30.3"; sha256="164q259c1j7da3mcc79zjyisxzr5p4rdaps4dcxfvpfbwg1wkdyj"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; MVar_pt = derive2 { name="MVar.pt"; version="1.6"; sha256="09ln186nx713kp9kdi4zwxmg7kjzksh7skxkgf1mq8szvvzb1r8n"; depends=[]; }; - MXM = derive2 { name="MXM"; version="0.5"; sha256="1hm4cvaicx4nx303khm178y817cida8hqmhr0hx208fq8mlq1dzq"; depends=[betareg Hmisc lmtest MASS nnet ordinal pcalg quantreg ROCR survival TunePareto]; }; + MXM = derive2 { name="MXM"; version="0.8"; sha256="0929nk4h7vjs0fx7m9mvm5lrby5bp6jwjbzgv71h1vpgbm2sfqdm"; depends=[betareg doParallel foreach Hmisc lme4 MASS nnet ordinal pscl quantreg ROCR speedglm survival TunePareto]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; + MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.2"; sha256="0fa1wqz3fnq838azqd42937l5z1sk76cxbg8vpzx7sxxmn1v1a08"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; }; @@ -1314,28 +1379,29 @@ in with self; { MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; }; MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; }; - Matrix = derive2 { name="Matrix"; version="1.2-3"; sha256="11zi02hj083jh20lnxsiimnx4brksavbv7dmkp659w33cfzsnnwg"; depends=[lattice]; }; + Matrix = derive2 { name="Matrix"; version="1.2-4"; sha256="1ikrzc17bi0b5ldz63cgyfjmgf7pp8xv7xnx131n3gigl31nz6wd"; depends=[lattice]; }; Matrix_utils = derive2 { name="Matrix.utils"; version="0.5"; sha256="04ss99wbpcm7ad5kkznppyf5fa869fgghk4rhv0nds1fdp17hrzl"; depends=[Matrix]; }; + MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.8.0"; sha256="1xn21ngxyr3jj07whlclpikmp1hd59wp3i76ql2r8vwczx8nwxil"; depends=[plotrix pracma progress rARPACK Rcpp RcppArmadillo]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; }; MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-0"; sha256="0001kj0wnma4gmndxwz11dq6jq7kgcrvlw9iikf2w15lnmmihwzl"; depends=[ggplot2 raster]; }; - MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.3.2"; sha256="0mxdz3268mfw8h0hpg4bpfsp9rmbpc68bf2ah70i7gkmfq3x4zyz"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; + MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.3"; sha256="0ysfs03as0h4d0nwk40fhm6v9rf1rr0mfwdc5d5y8iigagqzcj9s"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive2 { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; }; + MeanShift = derive2 { name="MeanShift"; version="1.0-2"; sha256="1dj3zgqyggl4vyz2j008c33600j7cjkqh20zs46wy95yfhjj6jf9"; depends=[]; }; MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.2"; sha256="1q3i5j319gb8h3qvz2m1mds2a1042dzs8x5xln0v6fzc0k4nzyjr"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; }; MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; - MetFns = derive2 { name="MetFns"; version="1.0"; sha256="03kx8cr4c6mgjincf87m305fhryh1c42hdzr1ljl63affnlp7nfp"; depends=[astroFns plotrix]; }; MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; }; MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; }; MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; }; - MetaLandSim = derive2 { name="MetaLandSim"; version="0.4.1"; sha256="1n13l0p45afa92pa4vlq8kmy775z16l9mnli7b6l04hk09z02nnw"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos rgrass7 sp spatstat]; }; + MetaLandSim = derive2 { name="MetaLandSim"; version="0.4.2"; sha256="00lx78ryrhqcd7p9nikmfs80ysid11b2cg4nnf857h3lgnms78rr"; depends=[Biobase e1071 fgui googleVis maptools minpack_lm raster rgeos rgrass7 sp spatstat]; }; MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; }; @@ -1350,7 +1416,7 @@ in with self; { MfUSampler = derive2 { name="MfUSampler"; version="1.0.0"; sha256="0jl0vnjj0kyy49l51nh6xzp53h8wcb603v2p9wznplimskays2rh"; depends=[ars coda HI]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; - MicSim = derive2 { name="MicSim"; version="1.0.10"; sha256="0fwp8gf82p41lxj6263q3wdkflqxi1lc6sw7nj6y47xjhdycjm07"; depends=[chron rlecuyer snowfall]; }; + MicSim = derive2 { name="MicSim"; version="1.0.11"; sha256="0g6rqdk6vxxymkg6c0yqhhv7za1sk30m4wpi954cvx50swszy4ps"; depends=[chron rlecuyer snowfall]; }; MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.7.1"; sha256="0avgp99krlcaava7m32gj7ffz2rrj8g1zvaipk7bgsadnnpljmsk"; depends=[Hmisc memisc]; }; MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; }; @@ -1363,6 +1429,7 @@ in with self; { MixGHD = derive2 { name="MixGHD"; version="1.8"; sha256="0m115ws1gh5mbjaql38piwjg7463mx32ridpbics3406g7p3ba6w"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; MixSim = derive2 { name="MixSim"; version="1.1-2"; sha256="0p67x2q4rb7y5484gi4z8r3qxpav1hdmgw1wdxmiz363p6f8972v"; depends=[MASS]; }; + MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; }; MixedPoisson = derive2 { name="MixedPoisson"; version="1.0"; sha256="1w826s2icdflfgyb31dvf077b6fx35idajyqv7bln1fr8wfb7zyf"; depends=[gaussquad MASS]; }; MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; }; MixtureInf = derive2 { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; }; @@ -1370,19 +1437,22 @@ in with self; { Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; }; Modalclust = derive2 { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; }; ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; - ModelMap = derive2 { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[fields gbm HandTill2001 PresenceAbsence randomForest raster rgdal]; }; - Momocs = derive2 { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 ape jpeg shapes sp spdep]; }; - MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.0"; sha256="00v0k0p91d5g92j3zlzs0d8mnrhg4fm5sh5y1ks5ckyhbhw6msmz"; depends=[codetools DBI digest]; }; - MonoPhy = derive2 { name="MonoPhy"; version="1.0"; sha256="068m8s86k3gdv0cj2gsrmra4lgl0xwbqa4kcv415gnzcmsyrpc42"; depends=[ape phangorn phytools RColorBrewer taxize]; }; + ModelMap = derive2 { name="ModelMap"; version="3.3.2"; sha256="04rnprv5xjk9l89pc7pvkvwpv0habd15ihl1ah792lwl44ibx84b"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; }; + Momocs = derive2 { name="Momocs"; version="1.0.0"; sha256="03gqylk1a6sf4ypxp7gzsv91m6iarfak6rby0i1666wzi4nn5zjl"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; }; + Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; + MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; + MonetDBLite = derive2 { name="MonetDBLite"; version="0.2.0"; sha256="1l6bkymssryw22m849wdcmza9abg0cwgasdq9hq4z1m9fkc5xais"; depends=[]; }; + MonoPhy = derive2 { name="MonoPhy"; version="1.1"; sha256="0vif66c5lkn1mqfhnk4di5jd5k86wf545a8pi0wlamjy5828n9jx"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.2-10"; sha256="03gzn7gq1dryjhkzs9z5i7bc8k8i7ilri26ifw772w8688pya05k"; depends=[quadprog]; }; - Morpho = derive2 { name="Morpho"; version="2.3.1"; sha256="10w25dycw3gag7sq730c40nnd39zlcbp07chvz4v94zq14vq2gyj"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; }; + Morpho = derive2 { name="Morpho"; version="2.3.1.1"; sha256="02xmbkz5qm15k0skwqcgzjxwkv9aas5ygi4dchc656j8r7spw6wp"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; MotilityLab = derive2 { name="MotilityLab"; version="0.2-4"; sha256="0fgv3w1231r85jv7v59vvfz9bcb4yrdvx89pk9g6zcspxixmc0c8"; depends=[ellipse]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot coda gsubfn lattice plyr texreg xtable]; }; Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.15.1"; sha256="04fl6m60z7h1a4mik58f8r8s3crx53n4jhg0lg9alnzipaij1qi5"; depends=[Matrix]; }; + MuMIn = derive2 { name="MuMIn"; version="1.15.6"; sha256="08qac7d1w367wjsz7n9ydziacbf8np8w8mm9izbxd4pk3ibxwi5a"; depends=[Matrix]; }; + MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive2 { name="MultNonParam"; version="1.2.1"; sha256="0fakycqvc8kqavdxmwsfww21f6ndlr0zwwwgh6asjffpdji798bb"; depends=[]; }; @@ -1395,14 +1465,15 @@ in with self; { MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; + MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.0"; sha256="1q1dcrn4wghhn0ailyvhvv3j2n62x1x4sd3lj20j7w1ix9zgsk6l"; depends=[bootstrap]; }; MvBinary = derive2 { name="MvBinary"; version="1.0"; sha256="1r65kcx458b0y49035nd1sj7rm62fr2inc3qgg5k6saylqihncn9"; depends=[mgcv]; }; Myrrix = derive2 { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive2 { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; - NAM = derive2 { name="NAM"; version="1.4.2"; sha256="1mnfls4mbsx3fxihd5vljzrr73xs85blyh1xwa78yfrg7rsaijyx"; depends=[randomForest Rcpp]; }; + NAM = derive2 { name="NAM"; version="1.4.4"; sha256="0410sxmqibw8iq398ha2ldf7p2vkqiryhfd176njjb8zxy9nixal"; depends=[randomForest Rcpp]; }; NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; }; NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; - NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; + NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; NCA = derive2 { name="NCA"; version="1.1"; sha256="11sx5y9i0y0c8r9z6lwjk4p9l4gmwj58i76z809l40mlld59igcz"; depends=[Benchmarking gplots quantreg sfa]; }; NCmisc = derive2 { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[dplyr proftools]; }; @@ -1413,10 +1484,10 @@ in with self; { NHMM = derive2 { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; NHMSAR = derive2 { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[caTools glasso lars SIS ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; - NIPTeR = derive2 { name="NIPTeR"; version="1.0.1"; sha256="0yv7zjx6993y9iis4hi27nilyfvqlxwbdmg2gw41wbq3cmyqmx5n"; depends=[Rsamtools S4Vectors sets]; }; + NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive2 { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; }; - NLP = derive2 { name="NLP"; version="0.1-8"; sha256="0vzb4rlr30ncqk2whl2apryab8nladm14p9awwg7mp5r4safs2ys"; depends=[]; }; + NLP = derive2 { name="NLP"; version="0.1-9"; sha256="0rszp2iakbaj4z76jdi9z996xxgyyp0pqkxgnva0jcfi5sq3ngxr"; depends=[]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-3"; sha256="1j6y9z8d4ms6lxrz9wq9ydvsnkf4ca5qps8yxmglx81i152aq216"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; @@ -1427,7 +1498,7 @@ in with self; { NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; }; NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; - NPBayesImpute = derive2 { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp]; }; + NPBayesImpute = derive2 { name="NPBayesImpute"; version="0.6"; sha256="09cs6nj1pw4wv4w8bd1c4rilidzx12ymjzah9d0c412bwv0gmdyl"; depends=[Rcpp]; }; NPC = derive2 { name="NPC"; version="1.0.2"; sha256="1rlxzvq09l2i0w5p5c37g1s3cccjvzpirn14v8dw89acvg3617q1"; depends=[coin dplyr matlab permute]; }; NPCD = derive2 { name="NPCD"; version="1.0-9"; sha256="0d3fwbq7cnhwnndza4vl25jw6pahvy8zzicgy4pd6r6md7c9rbhm"; depends=[BB R_methodsS3 R_oo]; }; NPCirc = derive2 { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; @@ -1456,7 +1527,7 @@ in with self; { Newdistns = derive2 { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; }; NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive2 { name="Nippon"; version="0.6.3"; sha256="1r13n65nzz3fm46q3ddy9gn5vbdym2x1h8cr12ajp40qrmjf41zv"; depends=[maptools sp]; }; - NlcOptim = derive2 { name="NlcOptim"; version="0.3"; sha256="1ywj8sb1k5nrhvrqjjvwackrhkxd43szccvbzss788n8rql46l79"; depends=[MASS]; }; + NlcOptim = derive2 { name="NlcOptim"; version="0.4"; sha256="0842qqn2wdhxzcj5l4ywxrm8qcavrgvkll6ns2d2lbniiczijpnw"; depends=[MASS]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.1"; sha256="08w0wkmj9s3sgrwq0icfmp7a1i29hq4594hjmlxqagc843p592r4"; depends=[lavaan]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; }; @@ -1470,7 +1541,7 @@ in with self; { ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; ODMconverter = derive2 { name="ODMconverter"; version="2.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[xlsx XML]; }; OData = derive2 { name="OData"; version="0.3"; sha256="0wd9z8k27vxblh1v95p3bx15i15yacqqfpwr15bnd0xnaw9sr0z7"; depends=[RJSONIO XML]; }; - OECD = derive2 { name="OECD"; version="0.2.0"; sha256="068j332g2ncyjld3w16c46drwjy7y8hq38p57bql3rwgly9xfy2j"; depends=[httr rsdmx xml2]; }; + OECD = derive2 { name="OECD"; version="0.2.2"; sha256="07flhhca7734fffcqvxjl1hlhbbhn6lch868rlpps0r99jxy8m5q"; depends=[httr rsdmx xml2]; }; OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; }; OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; }; OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; @@ -1484,21 +1555,23 @@ in with self; { ORIClust = derive2 { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; }; - OUwie = derive2 { name="OUwie"; version="1.46"; sha256="162ks8n50xcg0jk0ni39fxldrnl6vzdi20yan8mgnmf4mkqm813w"; depends=[ape corpcor lattice nloptr numDeriv phangorn phytools]; }; + OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; + OTUtable = derive2 { name="OTUtable"; version="1.0.0"; sha256="0wdzi1ii5hwvr2fby26ydc4jhwl0gyi24jnl4yib6621hnjgv10y"; depends=[]; }; + OUwie = derive2 { name="OUwie"; version="1.49"; sha256="1hmbyqr0b9n6ng87adij59jyjkzwf8lw6lfxjqqzpz9mh9k1fkvy"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv phangorn phytools Rmpfr]; }; Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; OasisR = derive2 { name="OasisR"; version="1.0.0"; sha256="0anw1ncbjjmlnhigcfwm9zqmp4ah5cfbmmm3588k95xxp6xq9vmv"; depends=[rgdal rgeos spdep]; }; - OceanView = derive2 { name="OceanView"; version="1.0.3"; sha256="0k281r358xg599n3h4avwbhnhgcfdawf36p8k3sxwv29292npkzv"; depends=[plot3D plot3Drgl rgl shape]; }; + OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D rgl shape]; }; Ohmage = derive2 { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; }; OjaNP = derive2 { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; - OmicKriging = derive2 { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel irlba ROCR]; }; + OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.4"; sha256="1g3yrrnrk4375wxzfdndsm963ma112k5njv18adh43vfzyzg5l2m"; depends=[Rcpp]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.3.1"; sha256="1dvyk2krmdgkq8ssf0w9iki2r5bq6m495zi456yys937kpgxyvwr"; depends=[BH digest MASS RcppEigen StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.5.2"; sha256="1ymh4im1d0ad6zjz4crrljvnb2g7aqisb2xqrxlsqljlbjbizmfv"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.2"; sha256="1cszyp4bvlypri9smd238r2bd05dwpcrsi6bs8yl5g2glfnv1zjn"; depends=[ggplot2 raster rgdal rJava sp]; }; OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; }; @@ -1513,7 +1586,7 @@ in with self; { OrdNor = derive2 { name="OrdNor"; version="2.0"; sha256="1zr8zzigrbf6r0zz4f0za6my6d67wxqzvmabl36pjxc3sq7jh83j"; depends=[corpcor GenOrd Matrix mvtnorm]; }; OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; }; OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; }; - OriGen = derive2 { name="OriGen"; version="1.3.1"; sha256="1xgh2085qy1vsjpwpf59qlpyxlb68lvhy9d1b37q6m48lp8cl299"; depends=[ggplot2 maps]; }; + OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; }; OrthoPanels = derive2 { name="OrthoPanels"; version="0.9-1"; sha256="1p8q0b9zm7dd84qh3mrz67lcd1r11z5rj0bp93nsl23q1m2998sc"; depends=[MASS]; }; OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; @@ -1521,18 +1594,19 @@ in with self; { OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OxyBS = derive2 { name="OxyBS"; version="1.0"; sha256="1h8jxiya6lz9ib53dm5wmhqg2y20p41mk6dqjx6k8zgjglqk8p9w"; depends=[]; }; P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; }; + PACVB = derive2 { name="PACVB"; version="1.1"; sha256="1qkh9a904xd46295jxqyj1ka993ibd0hbm026hjs2ji9pw894040"; depends=[BH MASS Rcpp RcppArmadillo]; }; PAFit = derive2 { name="PAFit"; version="0.7.5"; sha256="1rczpgy1qrzc1p02nssx5gyi8m71w5jl97scqaddqyzg1c0zfvrp"; depends=[Rcpp]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; - PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; }; + PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; PANICr = derive2 { name="PANICr"; version="0.0.0.5"; sha256="049ga5iiymqczvy51y52yk7yvv9xy0ibr64ly8ciqig84d5f4jjr"; depends=[MCMCpack]; }; PAS = derive2 { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; }; PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; }; - PASWR2 = derive2 { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[e1071 ggplot2 lattice]; }; + PASWR2 = derive2 { name="PASWR2"; version="1.0.2"; sha256="04vwgmi56spjriwp2ls5zcgslfg1y4pvwa0m33f9izay0y6q2wfx"; depends=[e1071 ggplot2 lattice]; }; PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; }; PAactivPAL = derive2 { name="PAactivPAL"; version="1.0"; sha256="10whjaqfz50llv9ij4l4vadkxba038l31vpp27wgjli9kvl39a2k"; depends=[]; }; - PBD = derive2 { name="PBD"; version="1.1"; sha256="15kwzprc71h14fimz5czh5qy8lf64b0fkzcyf00xz0q83clz5fnq"; depends=[ade4 ape DDD deSolve phytools]; }; - PBImisc = derive2 { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[lme4 MASS Matrix]; }; + PBD = derive2 { name="PBD"; version="1.2"; sha256="0pxm9pdmylg95v5pyppvyl64zx5vgypx5fksj18zvws6vpb60xab"; depends=[ade4 ape DDD deSolve phytools]; }; + PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; }; PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; PBSddesolve = derive2 { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; }; PBSmapping = derive2 { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; }; @@ -1546,21 +1620,22 @@ in with self; { PCPS = derive2 { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[ape phylobase picante plotrix SYNCSA vegan]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCovR = derive2 { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation MASS Matrix ThreeWay]; }; - PDQutils = derive2 { name="PDQutils"; version="0.1.2"; sha256="1782nnw5mag4impfs05rnapjfrzvbiw1mdrvfrq1v0h9zl43afrd"; depends=[moments orthopolynom]; }; + PDQutils = derive2 { name="PDQutils"; version="0.1.4"; sha256="1wag65qgfbwr506c9jnwbd4drkqapy41sswy9g1j94qm1iwgwcvz"; depends=[moments orthopolynom]; }; PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEIP = derive2 { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix pracma RSEIS]; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PET = derive2 { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; }; + PGEE = derive2 { name="PGEE"; version="1.0"; sha256="10js28w629y145q9zcc42ydw03ll2dh7pfzdqx2mmli300w88mvr"; depends=[MASS mvtnorm]; }; PGICA = derive2 { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; }; PGM2 = derive2 { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; }; - PGRdup = derive2 { name="PGRdup"; version="0.2.1"; sha256="1hkkpylfchs06a42q19sv9ixc3bd7ilk9jc4qmiqg42j0gsizilm"; depends=[data_table igraph stringdist stringi]; }; - PHENIX = derive2 { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; }; + PGRdup = derive2 { name="PGRdup"; version="0.2.2.1"; sha256="02xl20kiy0704pw3n72pk8bi1vxr30fz6n703p5j3f0f9n954sl6"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; + PHENIX = derive2 { name="PHENIX"; version="1.2.2"; sha256="09x8x8izv4faal772zrz0n867wzp3s6gmmqpr7lln7ww07vlh4gx"; depends=[ppcor SuppDists]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; }; PIGE = derive2 { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; - PK = derive2 { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; }; + PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; }; PKNCA = derive2 { name="PKNCA"; version="0.6"; sha256="0k04xb0akkk3d4m66v66wisxk38mn13avxk6zlm30fivwqh8vzw9"; depends=[digest doBy lattice nlme plyr]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; @@ -1571,7 +1646,7 @@ in with self; { PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; }; PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; }; - PMCMR = derive2 { name="PMCMR"; version="4.0"; sha256="1mxahv2q9kg10w72mchpi1zyf2vkd2vsvhhb94ql6hpjk3mfag3m"; depends=[]; }; + PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; }; PP = derive2 { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="1.3.0"; sha256="1v5538mwmdfgwyqi6a72b4hkhwl0b8xz3ai81cv4q8cbvgwgq8fj"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; }; @@ -1580,17 +1655,17 @@ in with self; { PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; }; - PReMiuM = derive2 { name="PReMiuM"; version="3.1.2"; sha256="1hq159vvk2bb1b1klwnjbry92yldvm4asl2khyv1i9vx7vamw71q"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; - PResiduals = derive2 { name="PResiduals"; version="0.2-2"; sha256="1c1j9avnaprlcw6x86cf4hy45cb7ki6pq8xj0gi6dyswbs1mxhlf"; depends=[Formula MASS rms]; }; - PSAboot = derive2 { name="PSAboot"; version="1.1.3"; sha256="13c73k3f7r59qfgcs8h234ljrdylg7wi5s0rwq3qlgar12rvifq1"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; + PReMiuM = derive2 { name="PReMiuM"; version="3.1.3"; sha256="0xlkk5r02kq6q8mgymbw6qmb6wdvxskx6jzyciv26wyd3rgis3al"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; + PSAboot = derive2 { name="PSAboot"; version="1.1.4"; sha256="1zfqpq0ibgazwppbxbmqvkvh9j5421xmj9132zghxki0xdy655ss"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; - PSCBS = derive2 { name="PSCBS"; version="0.60.0"; sha256="0xbr0xkhkriqfmimzag8ypgqs3f87b1jzw0d4hcgaakmz9wp4rjj"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; + PSCBS = derive2 { name="PSCBS"; version="0.61.0"; sha256="04msj4rnrbdcjbm5aqbzm2sirb8q4wkag2fgsbdrca61v0lfg5q4"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; PSM = derive2 { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; }; PST = derive2 { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[RColorBrewer TraMineR]; }; PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; - PVAClone = derive2 { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; }; + PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PVR = derive2 { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; }; + PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; }; PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; }; @@ -1600,34 +1675,36 @@ in with self; { ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; ParallelForest = derive2 { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; - ParamHelpers = derive2 { name="ParamHelpers"; version="1.6"; sha256="07lzqww0grkra14b1pviv1r39nsp0zj438zcqnw0q1lyvdflih23"; depends=[BBmisc checkmate]; }; + ParamHelpers = derive2 { name="ParamHelpers"; version="1.7"; sha256="0ddb50c8xvs85422ig8chrrn0vaz9dsqn95409i1qdfg9rf916fr"; depends=[BBmisc checkmate]; }; ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; - Pasha = derive2 { name="Pasha"; version="0.99.18"; sha256="049frfavx9zx0kqqb8qcllw2x5hj8mq8a5igqr91572kqjls34kx"; depends=[Biostrings bitops GenomicAlignments GenomicRanges gtools IRanges Rsamtools S4Vectors ShortRead]; }; + Pasha = derive2 { name="Pasha"; version="0.99.21"; sha256="0z77n5wplapdfcqxbak7mg58a9nnnwwqcznah5lswlwa0prz18jc"; depends=[Biostrings bitops GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors ShortRead]; }; PatternClass = derive2 { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; }; Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; }; PearsonDS = derive2 { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.0"; sha256="1jcwk4vr73brkg4syrbybkfdhbrzs2y9qxd7286h27i67xn1s199"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; }; Peptides = derive2 { name="Peptides"; version="1.1.1"; sha256="0a6806n7lpdyvmsbvrm0fd124dxd4q8ka0dxb22ri26n60vcyybr"; depends=[]; }; PerFit = derive2 { name="PerFit"; version="1.4"; sha256="1pjyns9qsqr7c3m5n8a12z3i2b0y98alq0fs84r909m4m5lb22k3"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; PerMallows = derive2 { name="PerMallows"; version="1.10"; sha256="1h3r4cpyc0fsxz4vr75jyah9gjwj6f7sbmm9yk7p8kk1wagp4a44"; depends=[Rcpp]; }; - Perc = derive2 { name="Perc"; version="0.1.0"; sha256="16wd83w41j6lrhhl8g16pxcjj1l9h8kvk9425d6njr81gwxwvngw"; depends=[]; }; + Perc = derive2 { name="Perc"; version="0.1.1"; sha256="0yckjgbapcja3qp718f48r1wfhc25dy5y8138x45w5vbdsj4jrrx"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; PhViD = derive2 { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[LBE MCMCpack]; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; - PharmacoGx = derive2 { name="PharmacoGx"; version="1.1.2"; sha256="0ja9c9r814acsm5zhmqvdj8v2a6fdksigraz2dy75vyhzy5xar51"; depends=[Biobase caTools downloader magicaxis piano RColorBrewer]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="1.1.4"; sha256="1xzirhj05gjl4jszz493g8r629jpllnkqk19yjyjj69gmnlalpdy"; depends=[Biobase caTools downloader magicaxis piano RColorBrewer]; }; PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; }; PhyActBedRest = derive2 { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; }; - PhySortR = derive2 { name="PhySortR"; version="1.0.3"; sha256="1qvyilcym9wcmfgrfbsf5aqy9i103wmavydry6nnd8ps2s07jvqv"; depends=[ape phytools]; }; + PhySortR = derive2 { name="PhySortR"; version="1.0.6"; sha256="0v5d0klii1sfs43np18aj2587li3jawqirvabjf51lz2iciagcl9"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; + Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; }; - PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; + PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-1"; sha256="0fdk70vfxgmf2hy6j0djbksi5znvilsi74rrbqd0lfhi841j15qj"; depends=[]; }; PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; @@ -1635,7 +1712,7 @@ in with self; { PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; }; PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[BB corpcor GenOrd MASS Matrix]; }; - PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.0"; sha256="0big81yvbz9qyw4h6h1ak2wzvn56g1d1809m7lnmd2kx780i2hsf"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; + PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.1"; sha256="1d6bb2486g5llpbpljmvagw4jijwslqi52jnpkamgzwz6w9y9svy"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[corpcor Matrix mvtnorm]; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; @@ -1649,12 +1726,12 @@ in with self; { PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; }; - PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.1"; sha256="0hicilawyjx8yihyrwkrppbxlmr9qjrbmy7fw3fq3h2lyw5fmv91"; depends=[PortfolioEffectHFT rJava]; }; - PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.4"; sha256="1dn7xjh9hlp8qrrbsrix6f7q769xzdgnjflzl2w5sxzqhb5xsnm4"; depends=[ggplot2 rJava]; }; + PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.2"; sha256="0qf9h4gwq148m4q9x2avbzw9m07zbs4ljhlqf8glk50bs6vjpfi2"; depends=[PortfolioEffectHFT rJava]; }; + PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.5"; sha256="0mwwfsf6bngxdk10sya19k2mhy4pq9pgyzz59pd5zxgs0rx4hl6k"; depends=[ggplot2 rJava]; }; PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; - PoweR = derive2 { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; }; + PoweR = derive2 { name="PoweR"; version="1.0.5"; sha256="0zr2p2hyxdh194n3s0g71q9zyvl67czp0wc39zl3fivfk3zkf98r"; depends=[Rcpp RcppArmadillo]; }; Power2Stage = derive2 { name="Power2Stage"; version="0.4-3"; sha256="1bad2r9kdpg5i9pqz6754xywwm1c1mbl16dxdnb92pjy2pkq1q7x"; depends=[mvtnorm PowerTOST]; }; - PowerTOST = derive2 { name="PowerTOST"; version="1.3-02"; sha256="1w3g81s55f06z4zcrf9hf3003l7jfvh95wx21lzxn11crjzwfh4y"; depends=[mvtnorm]; }; + PowerTOST = derive2 { name="PowerTOST"; version="1.3-4"; sha256="0zjbnxd9l8m9bw7p3px0qxv8xjhm2w4fx0i1j0jpm95q5i01cgmm"; depends=[mvtnorm]; }; PracTools = derive2 { name="PracTools"; version="0.3"; sha256="1n9h28nzxy0fs27w1gwyrbaijr437xqiprmkal0i4dz6da7w4928"; depends=[]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; @@ -1666,6 +1743,7 @@ in with self; { ProTrackR = derive2 { name="ProTrackR"; version="0.2.3"; sha256="0zdysy58s2prla07qfhlhsycmnnf7ydjz5dlhhng5da3bc1nlrq2"; depends=[audio lattice signal tuneR]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; + ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; }; ProfessR = derive2 { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; }; ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; @@ -1673,6 +1751,7 @@ in with self; { PropCIs = derive2 { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; }; PropClust = derive2 { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; }; PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; }; + ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; }; PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; }; PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; }; PtProcess = derive2 { name="PtProcess"; version="3.3-10"; sha256="175gdyvj1l1d3vm00p0z4sn1ggaf3hly383ngzx2l029nsrxz0zf"; depends=[]; }; @@ -1681,21 +1760,24 @@ in with self; { PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; PwrGSD = derive2 { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; }; PythonInR = derive2 { name="PythonInR"; version="0.1-3"; sha256="0p4h30wqsz8czz6r4xjg5q79190hq242x9fsaw7v5433px1gmr44"; depends=[pack R6]; }; - QCA = derive2 { name="QCA"; version="2.0"; sha256="0x8pyp1rj0kgs84q5i1f5qs8zx99sd3mj106s8h57mwad0y8xq4a"; depends=[lpSolve QCAGUI shiny]; }; + QCA = derive2 { name="QCA"; version="2.1"; sha256="0zdg2s0y1qgxyvrg5iims9il6cnsbf0hchj3l8z1b9w50gggdm8k"; depends=[lpSolve QCAGUI shiny venn]; }; QCA3 = derive2 { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; }; - QCAGUI = derive2 { name="QCAGUI"; version="2.0"; sha256="16hkn12j697aschj8h1zsznss7pfhy3h3xj5im0183ni4slibp4a"; depends=[lpSolve shiny]; }; + QCAGUI = derive2 { name="QCAGUI"; version="2.1"; sha256="1lbdx2hrj8im5z58x20l4sgihvc2njw8v1dgy3cmwcfka1l1dw3p"; depends=[lpSolve shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; - QCAtools = derive2 { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[directlabels ggplot2 QCA stringr]; }; + QCApro = derive2 { name="QCApro"; version="1.0-0"; sha256="1k7av1b8wmr91a6prvgkny65hvf185389shgxncywp51jqaxpikp"; depends=[lpSolve]; }; + QCAtools = derive2 { name="QCAtools"; version="0.2.1"; sha256="167vjlh8b1a1wxvfnqbh4x429xvfhf789v8k6brlh7x5n6bmk114"; depends=[directlabels ggplot2 QCAGUI stringr]; }; QCGWAS = derive2 { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; }; QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; }; QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; }; + QICD = derive2 { name="QICD"; version="1.0.1"; sha256="136f7qv69x0a5bz5pa1jfawn7vikd90qv3fk8pjga9azpmfjj2wn"; depends=[]; }; QPot = derive2 { name="QPot"; version="1.0"; sha256="1dw2hzl6hif9g5kn37zyvd1gglqg67ki6ii42rl4vr5p3ar4f8pb"; depends=[MASS]; }; - QRM = derive2 { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeSeries]; }; + QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTLRel = derive2 { name="QTLRel"; version="0.2-15"; sha256="15wli0mpcmp7vc4jwp393w0qfm5g5n8dj724j38s711ir98w660b"; depends=[gdata lattice]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; QZ = derive2 { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; }; QoLR = derive2 { name="QoLR"; version="1.0.2"; sha256="1vvs5a4yl1isy0kqxzr2kcfg3y6bg3n2gsy7a2qgch92vjffd18a"; depends=[survival zoo]; }; + Qtools = derive2 { name="Qtools"; version="1.0"; sha256="12ifrk0g63hmfwq17sl25bz2m256jzp6n3lycsm2izm7rc0rv2c8"; depends=[boot MASS mice quantreg]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.7.0"; sha256="15j8wgk067ixmcp70k7fi6wnyl7mz26ljdgrcgy6dwgfng6286h8"; depends=[httr jsonlite xts zoo]; }; @@ -1705,12 +1787,12 @@ in with self; { QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; }; Quor = derive2 { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; }; - R_devices = derive2 { name="R.devices"; version="2.13.2"; sha256="1zvb3j2gj2anrryhhzy41yh7kmfan1q9x15757b1hiycdfvdfjzd"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; - R_filesets = derive2 { name="R.filesets"; version="2.9.0"; sha256="0rb9l2p35z0nnl5qlirn22dcnrk6jaa5ip7qaqyq40m8jnvhj9n6"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; }; + R_devices = derive2 { name="R.devices"; version="2.14.0"; sha256="1i40033w15q1nazm9ma0gfixb37mdy76yhcssgvaah1dx6p51xb4"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; + R_filesets = derive2 { name="R.filesets"; version="2.10.0"; sha256="0wdqxskmamqygvxh9jmvkhkgm906yrqci6vivczr9la0j4zwnn0b"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; - R_matlab = derive2 { name="R.matlab"; version="3.3.0"; sha256="1hg43lvdivj1x4s54vaj13z5dp92sndnpminhnqbk27kzmdczy84"; depends=[R_methodsS3 R_oo R_utils]; }; - R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; }; - R_oo = derive2 { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; }; + R_matlab = derive2 { name="R.matlab"; version="3.5.0"; sha256="1vpdv6ixcfl933r23l6v858ncs1x6gqsmr9nxjjsimx7q56mw6p9"; depends=[R_methodsS3 R_oo R_utils]; }; + R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; }; + R_oo = derive2 { name="R.oo"; version="1.20.0"; sha256="1l1x4r69mdchjyi6sq52p580fz3b3bqv6dpn1706y9n4vq47qx24"; depends=[R_methodsS3]; }; R_rsp = derive2 { name="R.rsp"; version="0.21.0"; sha256="0snc6ps75s3ci6sy8mil1wg2i9xmlr1ygh9n244y1brdvp43dfsw"; depends=[R_cache R_methodsS3 R_oo R_utils]; }; R_utils = derive2 { name="R.utils"; version="2.2.0"; sha256="1340g3agi4w5ab0kkc85rnfy6q03f13x3i9c58vn2jaaq5lmvy90"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; @@ -1718,7 +1800,7 @@ in with self; { R2BayesX = derive2 { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; R2Cuba = derive2 { name="R2Cuba"; version="1.1-0"; sha256="1zmlsambajzxkc9dawlqb0png8s502hwblq0vyhqgc08yf29b43w"; depends=[]; }; R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; - R2GUESS = derive2 { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; + R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[coda digest foreign lattice Matrix rbugs]; }; R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[boot coda]; }; @@ -1728,12 +1810,12 @@ in with self; { R2admb = derive2 { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; - R4CDISC = derive2 { name="R4CDISC"; version="0.4"; sha256="09rj3cwbdsigkvha0l11xymcf257mxq1gnrw1ky2lfrygl3ibm43"; depends=[XML]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; }; R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; - R6 = derive2 { name="R6"; version="2.1.1"; sha256="16qq35bgxgswf989yvsqkb6fv7srpf8n8dv2s2c0z9n6zgmwq66m"; depends=[]; }; + R6 = derive2 { name="R6"; version="2.1.2"; sha256="0yad91i9p4r8bbz6nq8zny39y767n9an7ak5p275ynx8km6v3yqv"; depends=[]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; RADami = derive2 { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; }; + RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; }; RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; }; RAM = derive2 { name="RAM"; version="1.2.1.3"; sha256="1p6rqqbp5q3pqy9m6npml52nkfh8pd4kc245kb22qjslbvl3rrkn"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; }; RAMP = derive2 { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; }; @@ -1745,11 +1827,12 @@ in with self; { RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.6"; sha256="0rrkw3s0r7qp87ikphi8i8dq5j46h5708h9phqi3hc0qkmkld8i8"; depends=[RCurl rjson]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; - RAppArmor = derive2 { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; }; + RAppArmor = derive2 { name="RAppArmor"; version="2.0.1"; sha256="19545bblzplnqbkf6p23ap6b51ma8n30ivxrx57p1rmnnnj55vdz"; depends=[]; }; RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.0-33"; sha256="0n49qiam8ydlhhqk2f1h0rqdsl4ivx2vmz9n11kf4yfrq06a02a7"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBerkeley = derive2 { name="RBerkeley"; version="0.7-5"; sha256="049qvlpqwcaj82fdl815c0b2il7jbs6karibqpkq0fa3hq0q4hzz"; depends=[]; }; + RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; RCALI = derive2 { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; }; RCEIM = derive2 { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; }; RCMIP5 = derive2 { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind digest dplyr reshape2]; }; @@ -1762,15 +1845,15 @@ in with self; { RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.1"; sha256="1wlsp9idywgkcr2v68yj8gabyxd4ss6vzqr4z2id7fgvyqk8fyy4"; depends=[httr plyr RCurl XML]; }; RCryptsy = derive2 { name="RCryptsy"; version="0.4"; sha256="01rz9wz5y1k77mjw4zs0jng3k4zwqda32m5xvw6kx7vkgzfas6q0"; depends=[RCurl RJSONIO]; }; - RCurl = derive2 { name="RCurl"; version="1.95-4.7"; sha256="1qsxffqcb3lg3zkq6l1l78bm52szlk4d2y2bnmxn4lg0i4yxfx48"; depends=[bitops]; }; + RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="0.9-1"; sha256="0ir8qp3k326gxy5f0hy144zi8xcgsk6svahz7lr5pjfj05czmxxm"; depends=[assertthat dplyr plyr R6 rlist tidyr XML]; }; - RDS = derive2 { name="RDS"; version="0.7-4"; sha256="0vgpka1d05k2cymxwp3m3rlshn7lxgffd6j3xjjwxywnc7aq82qs"; depends=[ggplot2 gridExtra igraph reshape2 scales]; }; + RDS = derive2 { name="RDS"; version="0.7-5"; sha256="13zdan1riq5yzyixywr69svz42i5rp9n3fsz8zwmp2d64y8wsr3j"; depends=[ggplot2 gridExtra igraph reshape2 scales]; }; RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; }; RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; RDota = derive2 { name="RDota"; version="1.2"; sha256="1r56s4ii37szmdwgbnlw2g9576kjvyc79nvnfrsgr5mys62pbrzs"; depends=[XML]; }; - REBayes = derive2 { name="REBayes"; version="0.58"; sha256="047dq82nnj600hzs010iqfi8m58433n62xm8ji0ylln1wkjmpxnp"; depends=[Matrix reliaR Rmosek]; }; + REBayes = derive2 { name="REBayes"; version="0.62"; sha256="03fzmj4illah6xa4j4qh8srzxlrda8i4j71sd3269rs6lf2n9bw7"; depends=[Matrix reliaR Rmosek]; }; RECA = derive2 { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; }; REDCapR = derive2 { name="REDCapR"; version="0.9.3"; sha256="0il1b1sc05kigl8937s853a73k54xdr16sr4g8c11qyv54iy8d9a"; depends=[httr plyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; @@ -1784,13 +1867,13 @@ in with self; { RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; RFOC = derive2 { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; - RFgroove = derive2 { name="RFgroove"; version="1.0"; sha256="13cf2grp87j7mm0lqf8f65d1pzypjp3b7g09f35x6dfirvc7lkdy"; depends=[fda randomForest wmtsa]; }; + RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; }; RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; - RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; }; + RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; }; RForcecom = derive2 { name="RForcecom"; version="0.8"; sha256="1w3m6rdmycrjhigs4h9bqy5xqsjwkz2cb1idch397iwxrjzsx1ph"; depends=[httr plyr RCurl XML]; }; RFormatter = derive2 { name="RFormatter"; version="0.1.0"; sha256="01izxfnwhpy4wgp8ry0xasjjd63071gk1962dl2wzjycgcsig5p5"; depends=[formatR]; }; RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; - RGA = derive2 { name="RGA"; version="0.3.2"; sha256="17yki9vfqmrb9pgnyzw1x81f6jzv53lq3z69324c04wd6507ykv0"; depends=[httr jsonlite lubridate plyr]; }; + RGA = derive2 { name="RGA"; version="0.4.1"; sha256="1zwkxm1xwgfdd5r4jkgzrfj4hgrdnzz8z0a75318fbpaw1cvaqwq"; depends=[httr jsonlite lubridate plyr]; }; RGCCA = derive2 { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; }; RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; @@ -1798,7 +1881,7 @@ in with self; { RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; }; RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; - RGraphics = derive2 { name="RGraphics"; version="2.0-13"; sha256="10c6wiqh074bmbg2gwdscwp5kj8afs152ipv0byyqw5n2r8fw0w1"; depends=[ggplot2 lattice]; }; + RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; }; RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; }; @@ -1806,14 +1889,13 @@ in with self; { RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; RI2by2 = derive2 { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RIGHT = derive2 { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; }; RISmed = derive2 { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; - RImagePalette = derive2 { name="RImagePalette"; version="0.1.0"; sha256="1fzk5ias9sjlrmhgd29lmz6v3cqgcrwxynnm1znq2gx2hvnpllz2"; depends=[ggplot2]; }; + RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; RImpala = derive2 { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; }; RInSp = derive2 { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; }; - RItools = derive2 { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[abind lattice SparseM svd xtable]; }; + RItools = derive2 { name="RItools"; version="0.1-13"; sha256="1j7gwn1n3dn3xp0c9rwdlmkkw8arjvf9nq0glwc273nnyh4wg72k"; depends=[abind SparseM svd xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="1.5"; sha256="1dps81ni257j27dsfwpjz20r2q3q60myf29cdjphsmf7zwkrzpiz"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; @@ -1821,8 +1903,12 @@ in with self; { RJafroc = derive2 { name="RJafroc"; version="0.1.1"; sha256="1630f8nmpid5pax8gqxych8bqf8a1avgrk7yqisk3lf1yx3h68rq"; depends=[ggplot2 shiny stringr xlsx]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; }; + RKEEL = derive2 { name="RKEEL"; version="1.1.6"; sha256="11yc31jswdzm5kr7j9b2cpzd9rhwkirfk02df7z5i8ry420jhm5y"; depends=[doParallel foreach gdata R6 RKEELdata RKEELjars XML]; }; + RKEELdata = derive2 { name="RKEELdata"; version="1.0.2"; sha256="0wnzsf5mgal5cqdclfs1z396h47a7ikkf5raby8508yrv19czv5l"; depends=[]; }; + RKEELjars = derive2 { name="RKEELjars"; version="1.0.11"; sha256="0kmdzvybj8jyiq95clc52jzrnmwk5ifanjjpz3bw4ypvqmj86xn2"; depends=[downloader]; }; RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; RLRsim = derive2 { name="RLRsim"; version="3.1-2"; sha256="0wwcn9ch4bndrw5sizsd4cqaq1nvqgykx28dzp05r6wsabixnhxh"; depends=[lme4 mgcv nlme Rcpp]; }; + RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; RLumShiny = derive2 { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[digest googleVis Luminescence RCurl shiny]; }; RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; }; @@ -1834,26 +1920,28 @@ in with self; { RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; RMark = derive2 { name="RMark"; version="2.1.14"; sha256="15j50i05y8zpdawpk0x7ndhxwfcmxk3xajhh6lxzf81q1zg92hvd"; depends=[coda matrixcalc msm snowfall]; }; - RMixpanel = derive2 { name="RMixpanel"; version="0.1-2"; sha256="0c1hq2p6az04w49ysa2f61mjb32f3mg7082jm8dzqg204hf78id7"; depends=[digest jsonlite]; }; + RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; + RMixpanel = derive2 { name="RMixpanel"; version="0.2-1"; sha256="196z6qvcsh8xvpjaiif4l4h0xkmjgz8q35v5pqky9dc856v0cl9a"; depends=[digest jsonlite RCurl uuid]; }; RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.7"; sha256="0hxk9dh5xvki9cqnjmans65xxhms77xn6ckjh2hl5ls80swn2l1f"; depends=[DBI]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.8"; sha256="1czy9ahsmh13djapcllh7dx93sfpz8hcfx5yzbnmwymhw5svkk96"; depends=[DBI]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive2 { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; - RNeXML = derive2 { name="RNeXML"; version="2.0.5"; sha256="1zdj9a7zm5ck5s66c0lismzhff6lafglfz9li2mf76pgr41s4k1g"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; }; - RNeo4j = derive2 { name="RNeo4j"; version="1.6.1"; sha256="0ga4qq7gqwikhjg208dgql0ryh084jngbz3f6164g7ggmzc8m4if"; depends=[httr RJSONIO rstudioapi]; }; - RNetCDF = derive2 { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; }; - RNetLogo = derive2 { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[igraph rJava]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.1.0"; sha256="18zp2yjfmm06ph3ai65ng6q5j1c8g3r1q7s9m3fflzkq54qgs3gy"; depends=[ore Rcpp RcppEigen]; }; + RNeXML = derive2 { name="RNeXML"; version="2.0.6"; sha256="1ya628lhb6jidfwvl7dddsy9ww761zwznmg1m0snfqwggxc83y8g"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; }; + RNeo4j = derive2 { name="RNeo4j"; version="1.6.3"; sha256="16lkick2swi60pbx1wy869286irv39xb4di5a2vlvbsqjdl0lnrc"; depends=[httr RJSONIO rstudioapi]; }; + RNetCDF = derive2 { name="RNetCDF"; version="1.8-2"; sha256="0pn45z1bj777nkfglvwwhpji8vz39sd51yszfa5g6rqxiw1a7y5d"; depends=[]; }; + RNetLogo = derive2 { name="RNetLogo"; version="1.0-2"; sha256="1j0f14n91gks288sph40ki9wr21dg0bsdk9143f1wwhmwr3jm4wi"; depends=[igraph rJava]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.0"; sha256="1lh9mnv1nvmpx8pqa3bqrv3zc2079hqzajdg73fbq5lfhdpb0rb3"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.2.0"; sha256="0mik24n3qp8j8iy88ss642rgll7rrhxyyc86zh40b6n8y9qc37wq"; depends=[ore Rcpp RcppEigen]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; }; ROCS = derive2 { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; }; - ROCt = derive2 { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; }; + ROCt = derive2 { name="ROCt"; version="0.9.4"; sha256="16kcq9dckwmn98izhnyzj9pcqb1ifs6b1hrx126gwb0zp3wdr8ym"; depends=[date relsurv survival timereg]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; }; - RODBCDBI = derive2 { name="RODBCDBI"; version="0.1"; sha256="008845kab70jvcp8mpkns8h24vhpkm0l6dxmip8cywh93qbygs23"; depends=[DBI RODBC]; }; + RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; RODBCext = derive2 { name="RODBCext"; version="0.2.5"; sha256="18a0ajqrq3rcfcsyz0c9mwq6bi03prpg83z9jasbbc866gqs6fvq"; depends=[RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; ROI = derive2 { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; }; @@ -1863,19 +1951,21 @@ in with self; { ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; RObsDat = derive2 { name="RObsDat"; version="15.08"; sha256="0n64jqba682rdy696yfpi5l5sw6g33421hg1rnb1dwdnvr7yd0y9"; depends=[DBI e1071 sp spacetime vwr xts zoo]; }; + ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; }; ROptEst = derive2 { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; - ROracle = derive2 { name="ROracle"; version="1.2-1"; sha256="19avgm4sxv052alh938bcvc7z8xx70vdwd9pilaidxydbar5kqz1"; depends=[DBI]; }; + ROracle = derive2 { name="ROracle"; version="1.2-2"; sha256="07ai4hmb9gjpx38l1jcdqlynpl5745m97lxvglrga6sv1z6q9cyb"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.1"; sha256="1sjzph00rxilgk4vxiklfdn6ji2f9b5jz7hd83pcsdinrwy6pjxg"; depends=[ape cluster deSolve fpc igraph picante pspline pvclust TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[class MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; }; RPMM = derive2 { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; }; RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; - RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.1"; sha256="1i9fcypi33qi7lz6rs1i5mvnbfma15jw6n5is03zdd1cjgrnss8r"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; + RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.3"; sha256="0qgvr671zir8d1q5rzdy0gkljsfr7bz1aj47xpkbbpkjr5hqgihj"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; }; + RPresto = derive2 { name="RPresto"; version="1.2.0"; sha256="0dv7yqxy0pj85dbpr1l6lh33rmmxw5g3fy7g3bvraaif3h3f1pv0"; depends=[DBI httr jsonlite RCurl stringi]; }; RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.3"; sha256="00sik2ri64bvvhrdpb91myrhzwwk3y67m214mi21q3b8710mmcaf"; depends=[Rcpp RCurl]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; RPushbullet = derive2 { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df0ijwhfc2bi29y61fl9zg3mp4xygx3fyr9mycjm7a"; depends=[RJSONIO]; }; @@ -1884,32 +1974,34 @@ in with self; { RRF = derive2 { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; - RRreg = derive2 { name="RRreg"; version="0.6.0"; sha256="0wn6cgzf8q232svslhlndwk0i35hc4ghrm0niv85kagymnixipqj"; depends=[doParallel foreach lme4]; }; - RSA = derive2 { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; + RRreg = derive2 { name="RRreg"; version="0.6.1"; sha256="1vf40xcg39hh9wz6hjfr2p10pzpbs4b6x5hmsf1njajcf6yfl09q"; depends=[doParallel foreach lme4]; }; + RSA = derive2 { name="RSA"; version="0.9.10"; sha256="0m9gd1h9ghj6gfwixwy8hhc2625f9mi473zp55zdl5w2q10qk3ij"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; - RSAGA = derive2 { name="RSAGA"; version="0.94-4"; sha256="10pcjnhsy635ify3dnwfzaigdpx48l06ba77maagjbvwzylrh3k6"; depends=[gstat plyr shapefiles]; }; + RSAGA = derive2 { name="RSAGA"; version="0.94-5"; sha256="0lbvy1p6wcxnn70149wcpmfy2ijk6g37ka452dxm0w0zpg0zga1w"; depends=[gstat plyr shapefiles]; }; RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; }; RSDA = derive2 { name="RSDA"; version="1.3"; sha256="0f2f6bn11p43sv8zmvqpf5w1rdisf7b2dvllhiy3pg9f6r1mc85k"; depends=[abind FactoMineR ggplot2 glmnet princurve RJSONIO scales scatterplot3d sqldf XML]; }; RSEIS = derive2 { name="RSEIS"; version="3.5-2"; sha256="1mm4l6yymd564ahc189iaanw8j51jxdfpiif47zf4603irl1bglp"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; }; RSKC = derive2 { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; + RSMET = derive2 { name="RSMET"; version="1.2.9"; sha256="1da7kck5g0vcd1ly7xaa1i8d9b1qjf6kwf35sq5d71hfbgx2fb4k"; depends=[stringr]; }; RSNNS = derive2 { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5"; sha256="0jkibpimh61n869r260qilkacq64awcjgpz46wvqadxw330a3p8c"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; - RSQLServer = derive2 { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; }; + RSQLServer = derive2 { name="RSQLServer"; version="0.2.0"; sha256="1lxk4qw8kl0v7fjl9836arjyvqwwrmph5wyhcmmzg1i6ldn0rd7f"; depends=[assertthat DBI dplyr lubridate rJava RJDBC yaml]; }; RSQLite = derive2 { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; }; RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; }; RSeed = derive2 { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[graph RBGL sybil]; }; RSelenium = derive2 { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[caTools RCurl RJSONIO XML]; }; RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; - RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.6"; sha256="0hah1gc8g81icymmk6z3799c4wc4zml8njllypagyb2jxmjyvm88"; depends=[base64enc digest httr jsonlite plyr stringr]; }; - RSocrata = derive2 { name="RSocrata"; version="1.6.2-10"; sha256="0nj0g40cy1g47j6nyp3a86g4gcm9ipalbm7dsy2s7367r7k0fa65"; depends=[httr jsonlite mime]; }; + RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.7"; sha256="09g64ndfglpznjp39k4ry40rn7h6chjs3xfs9h3vh3wg7qy8q4vx"; depends=[base64enc digest httr jsonlite plyr stringr]; }; + RSocrata = derive2 { name="RSocrata"; version="1.7.0-14"; sha256="1nw3ga1ff1vsgfljmqdwcmxv9w04nldjrish2226l3r8632iy4am"; depends=[httr jsonlite mime]; }; RSofia = derive2 { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; }; + RSpectra = derive2 { name="RSpectra"; version="0.11-0"; sha256="04r59jv0s7ji05d0q1yis8fljj7c5rj82sh7hhl8dfxzy4d6f8hb"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStars = derive2 { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; }; RStata = derive2 { name="RStata"; version="1.0.0"; sha256="07y9c1yk2kh37adsdn3vx2k8hqggffiipn5gl1qf6ai5ls5xmfg5"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.1.3"; sha256="0axvz3vby0mvrbzmmbvfb8a79sszaskmzxlfkpsb0sjpajby8vkn"; depends=[caret codetools doParallel foreach geosphere ggplot2 plyr raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.1.4"; sha256="0f6qr6zd2ajfvwxnsa09pdcr42fhg4wd07qr1a4yb7yk0jqawayy"; depends=[caret codetools doParallel foreach geosphere ggplot2 plyr raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; }; RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; RSurveillance = derive2 { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; }; RSurvey = derive2 { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; }; @@ -1921,44 +2013,45 @@ in with self; { RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTriangle = derive2 { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; }; RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-52"; sha256="073x1kxdsriddf5lg1h8xzcxg6nlaigkb2ird9mjmkzl9yn4safl"; depends=[ade4 boot car cramer lme4 MASS mixOmics multcompView nnet pls pspearman statmod vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-53"; sha256="0lapj54w0vr2v5qsnllq1p7nibqldqw1pi2qxlzzypl9lixznxw2"; depends=[ade4 boot car cramer lme4 MASS mixOmics multcompView nnet pls pspearman statmod vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; + RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; }; - RViennaCL = derive2 { name="RViennaCL"; version="1.7.0-0"; sha256="1jj22avf5hdh81xzq4wx6ir351ssx1nr63n0785ms9my5skdfn7v"; depends=[]; }; + RViennaCL = derive2 { name="RViennaCL"; version="1.7.1-1"; sha256="135wa3q954nrkwfs5q0x2z9q6izjxyz4wzk7wx4ncx56jqp038kz"; depends=[]; }; RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; }; - RVsharing = derive2 { name="RVsharing"; version="1.3.4"; sha256="0v267m7gfvc6fvfh4i53jk2xcr21kih6ddlgvb600j5ck6mi14vf"; depends=[kinship2]; }; + RVsharing = derive2 { name="RVsharing"; version="1.4.0"; sha256="1csnmh3hhzbzp6cj7s8q41bjac26ng0p22vd696pqc0sl0fprppw"; depends=[kinship2]; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; RWeather = derive2 { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive2 { name="RWeka"; version="0.4-24"; sha256="1nzpwh5i4snlz5hpk27395f6ly2mfzif6fw1cb6yn2sba0nj0ls7"; depends=[rJava RWekajars]; }; - RWekajars = derive2 { name="RWekajars"; version="3.7.12-1"; sha256="0a3a33l4rglyj95v6m3lqdz0c1fzriprdlp1p8cx2v06n50ymvrz"; depends=[rJava]; }; + RWeka = derive2 { name="RWeka"; version="0.4-25"; sha256="0bskypj9153593jq4l4rn9wibydv3py9pq2qmk803d3aqggbqzyg"; depends=[rJava RWekajars]; }; + RWekajars = derive2 { name="RWekajars"; version="3.7.13-1"; sha256="0g8xddi654s4xih5mx6fr1ra7jha9hxhnbns688vqp7l75nv5xgf"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; }; RXKCD = derive2 { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; + RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; - RadOnc = derive2 { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[geometry oro_dicom ptinpoly rgl]; }; + RadOnc = derive2 { name="RadOnc"; version="1.1.1"; sha256="05ba1yb37fzd2w3w69r4kyjnpgxjg5ssixxhh4iak6g9b3c0i5gq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; Ramd = derive2 { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; }; RandVar = derive2 { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; - RandomFields = derive2 { name="RandomFields"; version="3.1.4"; sha256="0f7zidw1s7qd1zpan67l1hki1g094vkq2cxzanczl8dybfjv9g7g"; depends=[RandomFieldsUtils sp]; }; + RandomFields = derive2 { name="RandomFields"; version="3.1.8"; sha256="1yaf7mzhi61n7s3n44fxwilry5s7wnqq7sbx09jarm1jkbn3gk6x"; depends=[RandomFieldsUtils sp]; }; RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.0.14"; sha256="1phnzmj9cbdaxp1v47irxk0c41fyh5qqs7m9y1gxvkpy2l8xkfr2"; depends=[]; }; RankAggreg = derive2 { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; - Rankcluster = derive2 { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp RcppEigen]; }; + Rankcluster = derive2 { name="Rankcluster"; version="0.93.1"; sha256="1ki0x8fkdzvycyqgx5z2wrdgcjmbj0c379f88k6hngvg7h1fq05k"; depends=[Rcpp RcppEigen]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; }; Rarity = derive2 { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; }; RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; RbioRXN = derive2 { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; - Rblpapi = derive2 { name="Rblpapi"; version="0.3.2"; sha256="1a1w1mfs3nkjx3a0n1705w1znx88k0r8vv6dpg867zgd4mppdxfc"; depends=[BH Rcpp]; }; + Rblpapi = derive2 { name="Rblpapi"; version="0.3.3"; sha256="1w5dwza2ly38yz0cpazjibvfv147z86njrwxmdhw9msz2a7lj2gj"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; - Rcell = derive2 { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[digest ggplot2 plyr proto reshape]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.1.2"; sha256="1cl2b96zk9kc01n7xp60z3855lscczf18yjyp0h3lgf57cr04gf5"; depends=[]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; @@ -1970,23 +2063,24 @@ in with self; { RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.31"; sha256="1czppk8wxf7hqm6f73zk4v9dyj3p2ch7ghdpkw4z7d727v240szq"; depends=[Rcmdr]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.32"; sha256="1zd467z7ydlv9w9gr4qqs3yl4xbmxc8pfw55mqdn6zz11xjbxbpk"; depends=[Rcmdr]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; - RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; }; + RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; + RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.1"; sha256="1ib9lpvz0ns3f44in29cvh746zl101lrv29p1df1zcdfcjnq1qq1"; depends=[GWRM Rcmdr RcmdrMisc]; }; RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-43"; sha256="0bn94wcrzvcrzhixh8kyg5gkax762mskhm2wvdfz1sm3n6fc7281"; depends=[HH lattice mgcv Rcmdr]; }; RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; }; RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-3"; sha256="1nkpj36mxqlfnxk7q023vbcm202kcjhba5jjccqkpikmggbqx9jz"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; }; - RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; }; - RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.3"; sha256="0iyy3kzczifz1ipp8sscaycxd2b2bs86sdmgz9w3gsxxqlrhkqh6"; depends=[MASS mixlm pls Rcmdr xtable]; }; + RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.0"; sha256="13nrgrxx2x76mq0xanhwdcadc82pd6i3q535nxn55jspabir6lqc"; depends=[ordinal Rcmdr]; }; + RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.5"; sha256="1sj2f7mhlny2wn5wp4ig9ivl3nlywscapxdy01vmq0fczv073hfp"; depends=[MASS mixlm pls Rcmdr xtable]; }; RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-1"; sha256="1hk8gmv74mngcx2pjgv1zkdh2csixxgd4yqz38bdn1l2zf243czq"; depends=[coda igraph Rcmdr rmeta runjags]; }; RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; }; RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; }; RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; }; RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; }; RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[Rcmdr rgl TeachingDemos]; }; - RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="2.0-4"; sha256="066h5idmmjng4i1n84rbvqgjnj7f1xrj32l1icm1dw3gsh2ipa5l"; depends=[randtests Rcmdr tseries]; }; + RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="2.0-5"; sha256="1ykfln99qh07v6n0xaawgckrbw4vsnamsyzz0d47sgg8ffdbxifr"; depends=[randtests Rcmdr tseries]; }; RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; }; RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; }; RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; }; @@ -2002,28 +2096,28 @@ in with self; { RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[date Rcmdr survival]; }; - RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.4"; sha256="0badjhi6k1sy2ap0j9ks537q7qw68vch6dmb79hnb1n2vdjzv28x"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; + RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.5"; sha256="07lzn84na59sibgmyrrn444klxqgqqw0zf88j0ycnn41152hb4yi"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="0.12.2"; sha256="03hfyyh5i85dw8w5hqahlsh3pp70k3981nwrcc3v04ymcysv6kij"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="0.12.3"; sha256="11i3w6q5hwqq9mglyqdrj5fphb3iwrcp178kb4bjm95s2jzv5krr"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.7"; sha256="0lhpnlrgdki8ljswi4yr2pfsm5lqx7ckfb09zlsjdw0lkz0vdb49"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.6.400.2.2"; sha256="166qaz2a85l0jixzcp8j9h7h8rw76qmrnb04v82xr35agfi9cq9x"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.6.600.4.0"; sha256="0h83rkv706r36lawi21d7pv030zv81sdqzygjca95d43gvz8ap4l"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.0.2"; sha256="1rslxzkqq5a67b2aajk2zvklf44db06q8hflw2y7flp1xilw9kpq"; depends=[Rcpp]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.0.3"; sha256="0zsif6ijp806h3lrz5i3cfv84sb4mvc58mpb6iwrcfdwxagb3c8q"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; - RcppDE = derive2 { name="RcppDE"; version="0.1.4"; sha256="1pmrxs2lnpc8hw8f4fdnh9a3fhmin223jbxrnmfkp08krnjybhx9"; depends=[Rcpp RcppArmadillo]; }; + RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; - RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.5.1"; sha256="1j41kyr2xsq0ha3dhd0iz62kghkvhnf8zp15qb4kgj6www086b4s"; depends=[Matrix Rcpp]; }; - RcppExamples = derive2 { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; }; + RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.8.1"; sha256="10fn13fvlip92n8pbv08988ll89c6zjr9d9jj8zw5i9iamwbik6f"; depends=[Matrix Rcpp]; }; + RcppExamples = derive2 { name="RcppExamples"; version="0.1.7"; sha256="1dyw040cw8zvr2rryf2qw5jmvc3hpn292wk3iiagjgkibqx49af9"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.0"; sha256="1960sn9c3k1vp791c11srkid2nvvnhwl3hjrcaaljd590bxh4hz8"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[BH Rcpp RcppArmadillo]; }; RcppOctave = derive2 { name="RcppOctave"; version="0.18.1"; sha256="1b2mwnsx799a86hdpkqy6l1m048g8hqz57l70siybkxnlaib3z0f"; depends=[digest pkgmaker Rcpp stringr]; }; - RcppParallel = derive2 { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; }; + RcppParallel = derive2 { name="RcppParallel"; version="4.3.15"; sha256="03hyawm2zispknz157nn8rvf52kg15jdl0pv8282zjrq8xh8477x"; depends=[]; }; RcppProgress = derive2 { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.6"; sha256="1jslck903qi6i8vsb7a2svh887linak00ylmhabzkbbsjrjchp9h"; depends=[RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; }; @@ -2042,15 +2136,16 @@ in with self; { ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.3-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; }; - RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; }; - RefManageR = derive2 { name="RefManageR"; version="0.10.5"; sha256="135545w8bzjw1ja0qx4dglra1p974frqcriqilby2hmix64bxwvy"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; }; + RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.0"; sha256="1mli7h3d4vw0sds6pav74fzpw4c3lmy7jrlp0dw47cmfxg2rhslg"; depends=[isva quadprog]; }; + RefManageR = derive2 { name="RefManageR"; version="0.10.6"; sha256="0wghxrd3ijvbzr945nbqba2cpn4vrzpny4yqlhala7fbdrd0kbbf"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; - Relatedness = derive2 { name="Relatedness"; version="1.2"; sha256="0m1vyjjf7qnpq2d56963k6hrjzv050vk2pn50rzppj14l1d35s14"; depends=[]; }; + Relatedness = derive2 { name="Relatedness"; version="1.3"; sha256="0ydfv8blqy7rfczh22cs704qsl3kzwfmw4pmbhci0m212y2dgm0y"; depends=[]; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; ReliabilityTheory = derive2 { name="ReliabilityTheory"; version="0.1.5"; sha256="14k979b9baqnz1gbhbjnp76nvdg5z1sc6p29h3v9qgvwv4aanp4v"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; }; Renext = derive2 { name="Renext"; version="3.0-0"; sha256="0byjr9jf2wmcg9adcxfky544icj6fclyscjj2l93ynwpcs9lmjan"; depends=[evd numDeriv]; }; @@ -2059,14 +2154,15 @@ in with self; { ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepeatABEL = derive2 { name="RepeatABEL"; version="1.0"; sha256="0qd6ijqfm32h87hncndv2n47rmn16gnbnkr0dg89h96xc3miyn2p"; depends=[GenABEL hglm]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; - ReporteRs = derive2 { name="ReporteRs"; version="0.8.2"; sha256="1widvbfwqvzcjyk746ybz921yifnn1q3ybi3ijy31mixqgm9m9ka"; depends=[ReporteRsjars rJava]; }; + ReporteRs = derive2 { name="ReporteRs"; version="0.8.6"; sha256="0j3945xgzvc9by623kfb1ds9xxsgax8yvvc78wv57lhlkzsb729l"; depends=[gdtools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; }; ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; - ResourceSelection = derive2 { name="ResourceSelection"; version="0.2-5"; sha256="11c02h9pwpfkjwsd0vzp9lw6jwdyx1jznyqjzalx4ikij4b3mda0"; depends=[]; }; + ResourceSelection = derive2 { name="ResourceSelection"; version="0.2-6"; sha256="0ysssac4f5xdpr3wk1d36dpqbzxabw49flm2yiifpfwzqgwz4r5c"; depends=[MASS pbapply]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; }; - Rfacebook = derive2 { name="Rfacebook"; version="0.6"; sha256="0pl4bch50yzahcqlwvsg8wfdnn8c0p9w7nwlvn0n5xx0cnanmybd"; depends=[httpuv httr rjson]; }; + Rfacebook = derive2 { name="Rfacebook"; version="0.6.3"; sha256="1whhrg2w7g1j6p5rhk3zqvigbjdwy3p7c094lmj1c42p4607nc52"; depends=[httpuv httr rjson]; }; Rfit = derive2 { name="Rfit"; version="0.22.0"; sha256="1qnfm2p8xqz45ma53fl9ddagj5spfl8i9sxvn3rq19dgkwbdhqw2"; depends=[quantreg]; }; - Rgbp = derive2 { name="Rgbp"; version="1.1.0"; sha256="1bz5w8xd9vldlsr23dsbp1s70xwsikl253awv8bk26hck76mk85s"; depends=[mnormt sn]; }; + Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; }; + Rgbp = derive2 { name="Rgbp"; version="1.1.1"; sha256="14xban9d182fhss9ppr13scih7hrbjd9s231avi4gkg79cz87s0s"; depends=[mnormt sn]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; }; Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; }; @@ -2081,14 +2177,14 @@ in with self; { Rknots = derive2 { name="Rknots"; version="1.3.1"; sha256="0yv8k85jzviz3gafbwggn1y4vlcjnfdiyf93gi6yvygdnsnrq310"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; Rlabkey = derive2 { name="Rlabkey"; version="2.1.129"; sha256="188h3j9hlx6ls0rs0f5n05l8d8l556dp49b93c77nw6bp7n4745l"; depends=[RCurl rjson]; }; - Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.6"; sha256="1ryjy9cxc6jw3xf5r1y8sa6b7yvc8mqpy0rw1zn00fmlf1m3ak34"; depends=[Rcpp]; }; + Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httpuv httr XML]; }; Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; }; Rmalschains = derive2 { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; }; Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; Rmixmod = derive2 { name="Rmixmod"; version="2.0.3"; sha256="0pxblg2si289599807hgcncq9jypabbrfpmv7fyg9hh7d8y19hd7"; depends=[Rcpp]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; - Rmonkey = derive2 { name="Rmonkey"; version="0.2.11"; sha256="0dfn38ni06k0q7a10ilb3169ffc71mizf25jfiqmbmqw08az8bhf"; depends=[httr jsonlite plyr RCurl]; }; + Rmonkey = derive2 { name="Rmonkey"; version="0.3.1"; sha256="14x076qhcbil7v1bh5x3zivqg04svcb7fvap47kcp3g95dk9jvxa"; depends=[curl httr jsonlite plyr]; }; Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; }; Rmpfr = derive2 { name="Rmpfr"; version="0.6-0"; sha256="06i5jzsddvync284ql16vlk439jp7la6n6yfgyxpck818hidz8a3"; depends=[gmp]; }; Rmpi = derive2 { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; }; @@ -2106,12 +2202,12 @@ in with self; { RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; }; - Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; + Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; }; Rpdb = derive2 { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; - Rphylopars = derive2 { name="Rphylopars"; version="0.1.1"; sha256="04qd6zzgjgrfnv3ffv3jzlcl4ilfb67fxza49qq4rzinxc2s392b"; depends=[ape doBy geiger mvnmle phylolm phytools Rcpp RcppArmadillo]; }; + Rphylopars = derive2 { name="Rphylopars"; version="0.2.1"; sha256="1407p6j6w41wg7apmjzl5xgjch97glqwn9pw0w95xz14ldnn8dk8"; depends=[ape doBy geiger Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; }; Rquake = derive2 { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[cda GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; Rramas = derive2 { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; @@ -2120,7 +2216,7 @@ in with self; { Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[fields jpeg RANN]; }; Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; }; - Rsomoclu = derive2 { name="Rsomoclu"; version="1.5.0.1"; sha256="0py7r837qww60c5ndh72nsj61xdq75mxbh5g3cabyqymvb596y2n"; depends=[Rcpp]; }; + Rsomoclu = derive2 { name="Rsomoclu"; version="1.6"; sha256="105isq1c1spwska886phi7dzp6qzifzvvy1r8gqlbv9v6lbgxshf"; depends=[class kohonen Rcpp]; }; Rssa = derive2 { name="Rssa"; version="0.13-1"; sha256="1v2gvk7pnzf2s2z0y7shjf0mz558lb6ian7vljkjcag06pyygmvi"; depends=[forecast lattice svd]; }; Rsundials = derive2 { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="1.0"; sha256="0s7f86cf2b3mwzwpfpl8cd1g41c8g5hzkykj9qigy1grnf37crvf"; depends=[]; }; @@ -2128,12 +2224,13 @@ in with self; { Rtsne = derive2 { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp]; }; Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; }; Rtts = derive2 { name="Rtts"; version="0.3.3"; sha256="0jphdpnpbq0d48kzflilxlh6psk282hi1hz3rmnwnd0rx5iyg624"; depends=[RCurl]; }; + RtutoR = derive2 { name="RtutoR"; version="0.1"; sha256="1a27kmasrdy06m0gh11pggx46f049f268hn0s651zb1hr8n3h5mi"; depends=[dplyr DT ggplot2 rmarkdown shiny shinydashboard]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; }; RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; }; - Rvcg = derive2 { name="Rvcg"; version="0.13.1.1"; sha256="08a78w9pvnypz9g63jz3d12z4fbdzjfr3xyis3fq31xn4jfdxa1g"; depends=[Rcpp RcppEigen]; }; + Rvcg = derive2 { name="Rvcg"; version="0.13.1.2"; sha256="1xlf26qzp8x6shcvxa5ka5c0hgbmv2ma1raj2a25ginmq28ld4ms"; depends=[Rcpp RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; }; Rwave = derive2 { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; @@ -2142,11 +2239,13 @@ in with self; { RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; }; Ryacas = derive2 { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; }; Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; }; - SACCR = derive2 { name="SACCR"; version="1.1"; sha256="0ynsspnx7i0n23bmqx207mxia1mwpwvl8zklqjdbmhvv5dg2jwzv"; depends=[]; }; + S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; + SACCR = derive2 { name="SACCR"; version="1.5"; sha256="101rki50m7kb0h17nrhm5pwjcm1c6ldynili69my1hqkymzwd51x"; depends=[]; }; SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; }; SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; }; SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; }; SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; }; + SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="0.1"; sha256="1ys88fgsx92b50x5y8xb0gp03spj0d29nqgw91yl95qwkg0d6bsg"; depends=[lattice]; }; SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; @@ -2155,13 +2254,14 @@ in with self; { SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; + SASxport = derive2 { name="SASxport"; version="1.5.3"; sha256="0hkwz4szl4rzl6arkn6kp8s7nk55g902hpslgzbkaz94wlrzp77z"; depends=[chron Hmisc]; }; SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; }; SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; - SCGLR = derive2 { name="SCGLR"; version="2.0.2"; sha256="1g8vgmlsc88g00rf3pxqszli4r9v3r4md6vq5lxa7j9wn28c7rp1"; depends=[expm Formula ggplot2 Matrix pROC]; }; + SCGLR = derive2 { name="SCGLR"; version="2.0.3"; sha256="03v76nh6ng41hh4lm27r8ipf382sj98dyl9lh4fzl4y6ff1vwzzj"; depends=[expm Formula ggplot2 Matrix pROC scales]; }; SCI = derive2 { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; }; SCMA = derive2 { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; depends=[]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; @@ -2171,13 +2271,13 @@ in with self; { SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; SDMTools = derive2 { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; - SDR = derive2 { name="SDR"; version="0.6.0.0"; sha256="0gjliq7pdssyqnchwyhf7mc6blrycfjg82bf75nxbhmis93g5dc4"; depends=[shiny]; }; + SDR = derive2 { name="SDR"; version="0.7.0.0"; sha256="181ify2yypcfqi1ayk1r0xq4xw4r74r6l2b11k0al9wwxa7gy3c5"; depends=[]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; SEERaBomb = derive2 { name="SEERaBomb"; version="2015.2"; sha256="1pm49icslhwd6j4xn6y9m7y7prjyn64bfvl5c12r2jkvq05sd6v8"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; }; - SEHmodel = derive2 { name="SEHmodel"; version="0.0.10"; sha256="0g6yzg1b4j5wy3fg4hhcrbcsrw86qaayalhxjv7m2jx6141f8cny"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; + SEHmodel = derive2 { name="SEHmodel"; version="0.0.11"; sha256="06678bxy4kprzzr2q7pyc3dscar1554bb7fgcgamlkisdzc32q74"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; }; SEMID = derive2 { name="SEMID"; version="0.2"; sha256="1897yjshcbidnrhr575sicsmhzyhjbagv0dp9g3nsv78syb6dr2p"; depends=[igraph]; }; SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; @@ -2185,11 +2285,11 @@ in with self; { SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SGCS = derive2 { name="SGCS"; version="2.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9rjbprlwf3h409dj59g6k2zx6"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; - SGP = derive2 { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; }; - SGPdata = derive2 { name="SGPdata"; version="12.0-0.0"; sha256="10d5ci3icc07lj1shgs72z8amgyx0d8g67bx73nbb7g0pfx2wqdn"; depends=[]; }; - SHELF = derive2 { name="SHELF"; version="1.0.1"; sha256="0nk63nrj0x1nlbwy885wmsipjcvhs8vqldlc33j4j8k49bkih7sz"; depends=[shiny]; }; + SGP = derive2 { name="SGP"; version="1.5-0.0"; sha256="0c5i28n6q41kksfskcd34199bk1abmwpy3md993aqbgf5bw54b4d"; depends=[Cairo colorspace data_table doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; }; + SGPdata = derive2 { name="SGPdata"; version="13.0-0.0"; sha256="11dm2nw7wzd2fbfyjb6a2byyiq1wfnfmlsxys7li6yf3j95d9jw6"; depends=[]; }; + SHELF = derive2 { name="SHELF"; version="1.1.0"; sha256="07r2r75rnlxkp0qxqzp4qcfddnjn2akyzr0v8vblcqrhcyd90y5l"; depends=[ggplot2 shiny]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; - SIBER = derive2 { name="SIBER"; version="2.0"; sha256="0k0hcl7nh0csdw33azz23xa57chif39z4snz8s46lkc0cvykvqww"; depends=[hdrcde mnormt rjags]; }; + SIBER = derive2 { name="SIBER"; version="2.0.2"; sha256="1jnrchwpvqk23vacn8dsh8mjqa5fdmvff1vqjc20xy42mdmkhr68"; depends=[hdrcde mnormt rjags]; }; SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; }; SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; SIMMS = derive2 { name="SIMMS"; version="1.0.2"; sha256="1phvphk7ir9zw77ycm27y4fin6wyxppsmb1cnm4xc83v1yq7lql4"; depends=[glmnet MASS survival xtable]; }; @@ -2214,6 +2314,7 @@ in with self; { SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; SNPtools = derive2 { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; }; SNSequate = derive2 { name="SNSequate"; version="1.2.1"; sha256="0pkf12cmbk4w7q8vn4rfz2wnb0rirn1lnn71jd3g4573lvk3fhdi"; depends=[magic]; }; + SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; }; SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; }; @@ -2242,14 +2343,15 @@ in with self; { SQUAREM = derive2 { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; + SSDM = derive2 { name="SSDM"; version="0.1.1"; sha256="1kg2694l42sbd0glzhvsykfpadmzarc275n88775g03as800vq1w"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard sp spThin]; }; SSDforR = derive2 { name="SSDforR"; version="1.4.12"; sha256="19rgr69ygbiq1lv3jnm282xn6914gh0rk99vxbgsx8zkc0n6cksy"; depends=[MASS psych TSA TTR]; }; - SSN = derive2 { name="SSN"; version="1.1.6"; sha256="1xd0b4zps750k9s51rxb9hmm1a3dvma8grjvvlaya9f3wzqw66ym"; depends=[BH igraph lattice maptools MASS RSQLite sp]; }; + SSN = derive2 { name="SSN"; version="1.1.7"; sha256="04gc06ic7np50qfyymvn8v1kiiyqpvm2yjxm6zfwbilm90k7ag0c"; depends=[BH igraph lattice maptools MASS RSQLite sp]; }; SSRMST = derive2 { name="SSRMST"; version="0.1.0"; sha256="05bjc2bmsfykrddch7ynixqsq6z813wvibpwh37223q78xpb8nry"; depends=[survival survRM2]; }; SSrat = derive2 { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; }; SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; }; STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; }; - STEPCAM = derive2 { name="STEPCAM"; version="1.1"; sha256="04c4px9x3hphsykjambpssdwnxpj2p5l0pq6yszlx7r7lqpzjb8y"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; + STEPCAM = derive2 { name="STEPCAM"; version="1.1.1"; sha256="009hd59hwvkrqq5g4psw3aw7qbdrqdxglkg7iyxhb6mz3lxbzym3"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; STMedianPolish = derive2 { name="STMedianPolish"; version="0.1"; sha256="1mysmigksrgkgzz7cng5vn8i7q4marq144dpwww30lisw2jgraiq"; depends=[maptools reshape2 sp spacetime zoo]; }; STPGA = derive2 { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; }; @@ -2259,16 +2361,17 @@ in with self; { SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; SWMPr = derive2 { name="SWMPr"; version="2.1.4"; sha256="0i0cy29rk1n4kdrrb7pdj4l8rlxnsabl9iv1pxb06a0fkwpwwk22"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr maptools oce RColorBrewer reshape2 tictoc tidyr wq XML zoo]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; }; - Sabermetrics = derive2 { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jnsak13vb1kcsbmh3hpass19gqic8grk0c3g1dvv6y"; depends=[]; }; + Sabermetrics = derive2 { name="Sabermetrics"; version="2.0"; sha256="00axm9wxwzasjrld9nfn1wqzrm2ybm7i6xh6005m9lnkb6qwmvi3"; depends=[XML]; }; + SafeQuant = derive2 { name="SafeQuant"; version="2.2.2"; sha256="1wlvrmn4v81zzk1apdyd8dmfrxrpciqp60m614sbkaymg268d4p4"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.7"; sha256="149ipraps9dngmvpy5w5q9a1zgnwqblhawrk6184g52ij33jv4ji"; depends=[mvtnorm]; }; - SamplingStrata = derive2 { name="SamplingStrata"; version="1.0-4"; sha256="007vrl8j0g8qy4qds29rzm5v5rgz076kkrwajpz5zxqy137c71jq"; depends=[]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.1"; sha256="0yxwkj61l6s29yz4adg6im7imx7vz6v9lkvdyr04cig0dhikxch1"; depends=[memoise]; }; Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; }; SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; }; SciViews = derive2 { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; }; - SciencesPo = derive2 { name="SciencesPo"; version="1.3.8"; sha256="1g9mvkg2080hnv7im2zvq1p7995zhyan6ql6c6fg47y5v9z8q4ds"; depends=[coda data_table ggplot2 gridExtra magrittr RSQLite scales stringr zoo]; }; + SciencesPo = derive2 { name="SciencesPo"; version="1.3.9"; sha256="1w3skni7q3nab1w09fms9gl3cwkr1dzw62iw2xxq21fm2ipawpc6"; depends=[data_table dplyr ggplot2 gridExtra lazyeval magrittr RSQLite shiny stringr vcd]; }; ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; }; ScottKnott = derive2 { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; }; ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; @@ -2279,13 +2382,12 @@ in with self; { Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.1"; sha256="0rn6ahqg3yriaf32rn07mdd5aqyqb35xv7v4ydc7q1ym1wmc9zla"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.3"; sha256="0w4d7vk9lwjrcchz8bx1hx550px7vxipw5kd0db2dsppiri13xmf"; depends=[MASS survival]; }; - SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.2"; sha256="0xfa3arn98pfnhbcq3p880v177dhczcjm5bc1m84kygbhiaifsjg"; depends=[MASS numDeriv Rsolnp]; }; + SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; }; SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; }; - SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.6-1"; sha256="16k7zbdwfxv517ac75f2b2wzqla2lqf7jr89n4cbz59wslznxymh"; depends=[ggplot2 magic mgcv survey trust VGAM VineCopula]; }; + SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.7"; sha256="1wk8r8n957l47s4wa6b6xps87p1h5jylif9m1a16d7a5i0bxjj6m"; depends=[ggplot2 magic matrixStats mgcv survey trust VGAM VineCopula]; }; SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.3"; sha256="14m3ahhp8xfnm01a0knd7qw2lrd1z3kxfazw8kin8g4dhcvhxwj7"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; - SensMixed = derive2 { name="SensMixed"; version="2.0-8"; sha256="0ii6vkhrasqmk672wwm6zpy0v0hrllvh9bpxz47x11sx6bg96v63"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; }; + SensMixed = derive2 { name="SensMixed"; version="2.0-9"; sha256="15ak95pwnwshgjgp8xpv5y87hbhcx38g4ky7wcjx71pzj2kcxdzj"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; }; SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; }; SensusR = derive2 { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; }; @@ -2294,41 +2396,43 @@ in with self; { Sequential = derive2 { name="Sequential"; version="2.0.2"; sha256="1ljrhzr08ynng54szym03gggkw9f6pni54fbkqwgcqja23597f80"; depends=[]; }; SetMethods = derive2 { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; }; SetRank = derive2 { name="SetRank"; version="1.0.1"; sha256="0zh5j6ksaggz46d9j37xpajyxlx7r83bv64yn9gdc6z20slrbch7"; depends=[data_table igraph XML]; }; - ShapeChange = derive2 { name="ShapeChange"; version="1.1"; sha256="1q1q7zv54c4lzcl8bhddbjkjszziijcc6khzg39bsjkcnbq3cpc7"; depends=[coneproj quadprog]; }; + ShapeChange = derive2 { name="ShapeChange"; version="1.3"; sha256="0f18z489rmrqyrwlmmv8qra0m65zbbhqkd00zc8sxnmkjn3jlzvw"; depends=[coneproj quadprog]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.2"; sha256="0z2drcpnfq78wdcd4zbg4pi0jbfs8jkqqjcmm53bzy7mlm0xm2qj"; depends=[coneproj raster rgdal]; }; - SharpeR = derive2 { name="SharpeR"; version="1.0.0"; sha256="107nk8ipqx4mzfhlv5b6k6vx60zi9rmvzk8qaxqic170p4ppcl2z"; depends=[matrixcalc sadists]; }; + SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.1"; sha256="1vzsl6y57fri8q4455pbmiidfj91986mv67nr4ikck7f1z82mq38"; depends=[]; }; Shrinkage = derive2 { name="Shrinkage"; version="1.0"; sha256="1n338zj4a063c8b9wajccp156kwxzirb70j8rppnklkq497plfc5"; depends=[limma multtest PsiHat]; }; SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; }; - SigTree = derive2 { name="SigTree"; version="1.10.2"; sha256="0d91s2x809mhirkmcdn8zvnivimssqhnydgfwchfrckk6p4jfm40"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; }; + SigTree = derive2 { name="SigTree"; version="1.10.3"; sha256="1la63w8kv9q0ci302s0lxdabx70smxxn669blynkhip9r30zjx8h"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.1"; sha256="1q7h3mfgs19jav8xp8xgzzk075fcmvz2lfbp64mzgpiin2rwx2q0"; depends=[rgl scatterplot3d]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.2"; sha256="1rx7bpdcf8h1dn647cwx0j7ss3lajizsnxd0cc9dj37v4g14bgyl"; depends=[rgl scatterplot3d]; }; SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.0"; sha256="0hrkwim582cb22ipy5vv1gp9bszjsqyzyzrwqwgy4247brag26fm"; depends=[evd]; }; - SimDesign = derive2 { name="SimDesign"; version="0.5"; sha256="0hz6vwibz2jr518dhxzj9iild7xxd18sa23fgxxv4h99wvfn1m89"; depends=[foreach plyr]; }; + SimDesign = derive2 { name="SimDesign"; version="0.8"; sha256="0sf0ajwhkrq3awa6nig09slj5d0bc18jim7d4vg51i4mygs258mi"; depends=[foreach plyr]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - SimRAD = derive2 { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[Biostrings ShortRead]; }; - SimReg = derive2 { name="SimReg"; version="1.2"; sha256="1iwackg95slxmpj5lla00bar096a845ziygh6g6hj4vwpkciv6fb"; depends=[dplyr ggplot2 gridExtra hpoPlot plotrix Rcpp reshape2]; }; + SimInf = derive2 { name="SimInf"; version="1.0.0"; sha256="0y7f6905k14y6rjz7lzx2s6q4l7fjl25dykha40vddcddc83spnd"; depends=[Matrix]; }; + SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; + SimReg = derive2 { name="SimReg"; version="1.4"; sha256="0lh2ra9k76zaffdn83an0xkff105iwn9ia3l2m6kijr3kl7ils38"; depends=[ontologyIndex ontologyPlot ontologySimilarity plotrix Rcpp]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; - SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; }; + SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.1"; sha256="1zxbrpsc96rhgnv5zcl2zgfmk7y6jshwnchh5dl1d3agqy36509r"; depends=[]; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; }; - SixSigma = derive2 { name="SixSigma"; version="0.9-0"; sha256="0gnd6ngm3w8lzlkl6sx9hn12z8rj4y1glm064n1s9q7chqll31hl"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; + SixSigma = derive2 { name="SixSigma"; version="0.9-2"; sha256="127q556amd40h636av71xv8vh7qn0kmax8yhvw1l5pfq2h3ms1s1"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; }; - Sleuth2 = derive2 { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; }; - Sleuth3 = derive2 { name="Sleuth3"; version="0.1-8"; sha256="02qbigg75ckyg65620bv88ggs4d9z3vivxd5j76x8hzg5lkk31yj"; depends=[]; }; + Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; }; + Sleuth2 = derive2 { name="Sleuth2"; version="2.0-3"; sha256="030wq178b7s9grdj3a65lplxv1p84m84yf9x4dild392p812199c"; depends=[]; }; + Sleuth3 = derive2 { name="Sleuth3"; version="1.0-1"; sha256="0vy7b69f5y3ahbgi8c2lr42xhz4h0z7zcyrai42050snjmwrxb1l"; depends=[]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.5"; sha256="0qa31z0wgl8bgc3ihgbfdmp1ang3wyy4qylj81zxh1yn2zxx5fr0"; depends=[ggplot2 htmltools httr rjson]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive2 { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; }; SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.19.0"; sha256="1zskfncg3dqg7bcw7ck33xqz5w05sz0xi4ajfalzzsmr1sbmh6wj"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; }; - SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[httr jsonlite RCurl]; }; + SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.3"; sha256="10208x0173glbb53997qa8fm57qpqzkwh0d42wk9izdb0k8l2fd1"; depends=[httr jsonlite RCurl]; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; }; SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; Sofi = derive2 { name="Sofi"; version="0.0.26"; sha256="0jcnwy308h8qdswapdqpphdx5757a4a6bmrdmyzh0ny52a4w07n1"; depends=[foreign sampling shiny]; }; @@ -2337,22 +2441,22 @@ in with self; { SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.2"; sha256="0y6iarjn1jiv5rscrszc1fg5m0jdhi5w5qwv4b0bvnh42hjb5rzb"; depends=[lme4 NAM reshape2]; }; - SpaDES = derive2 { name="SpaDES"; version="1.0.1"; sha256="0082lsry08calfrabq0jkpdba64mmkysz95b76l3rnh57rh2a91w"; depends=[archivist CircStats data_table DiagrammeR digest downloader dplyr ff ffbase fpCompare ggplot2 gridBase httr igraph lubridate R_utils RandomFields raster secr sp stringi stringr]; }; + SpaDES = derive2 { name="SpaDES"; version="1.1.1"; sha256="0d09z7plh1sc331b9r6klxq0k587x882sm9g6imdggzyq1m990l7"; depends=[archivist CircStats data_table DiagrammeR digest dplyr ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate R_utils RandomFields raster secr sp stringi stringr]; }; SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; }; SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; }; SparseM = derive2 { name="SparseM"; version="1.7"; sha256="0s9kab5khk7daqf6nfp1wm1qnhkssnnwnymisfwyk3kz4q5maqfz"; depends=[]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.2"; sha256="0a1iscn4l587hn582hx4v8fawn6d9gg1m173fc0bsfpkyckgq8hx"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; }; - SpatPCA = derive2 { name="SpatPCA"; version="1.1.0.0"; sha256="0dx0hjwwbizk699094ryhq0bvmizi12xyz9ygn3mxcg8xrdm5dm4"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; + SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.0"; sha256="0k9y4lm8ixvb571vab9lj3yblqshyb0p848dcc1g7jxibxwv4245"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="1.0"; sha256="1b5f65n8fdszl7wb4431xnmcw204yqaib8918m3m59sgh6anwhra"; depends=[raster sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="1.1"; sha256="07lcn2xq6aan4n7kdldzy5sbdl1jsab7j4zz7fvplr1n2hh41m03"; depends=[raster sp]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; }; - SpatialVx = derive2 { name="SpatialVx"; version="0.3"; sha256="199pfj1a6zmny87g27p6qvwhg1vpnwaiv8vsz51d5pj2bpd384gc"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; + SpatialVx = derive2 { name="SpatialVx"; version="0.4"; sha256="1kll0q9rkdwd4b003w2967jyz4yan1ypb0f9biwm2jjxxdqy058d"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; }; - SpecHelpers = derive2 { name="SpecHelpers"; version="0.1.19"; sha256="1y6mcxz5d0d48awzkp73v8h43bkn8yjhr7whrs5lxv8ykygzfic5"; depends=[gsubfn]; }; + SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.2"; sha256="1hwlyjpgzf2wgigbc49xcqhf6rzrjzkbriwa4i9gwpa0bnrs4wp1"; depends=[gsubfn splancs]; }; SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.4-1"; sha256="0ps1v5vp5ksi0xrykdizjkkylzsacdczbpncdj9d6khmbvvqi15p"; depends=[]; }; SpherWave = derive2 { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; @@ -2360,7 +2464,7 @@ in with self; { SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; StAMPP = derive2 { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; }; - StMoMo = derive2 { name="StMoMo"; version="0.3.0"; sha256="0vzb9z9rfvrap4dz81d9kyvlm38xnarrf1b3vm3fsvp5zljv66v2"; depends=[fanplot fields forecast gnm MASS reshape2 rootSolve]; }; + StMoMo = derive2 { name="StMoMo"; version="0.3.1"; sha256="0ly1bznixw4qbnag56xykj8gnfrzhqh5blsii32paalk0n920mrm"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; }; StableEstim = derive2 { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; }; @@ -2369,14 +2473,15 @@ in with self; { Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; - StatMatch = derive2 { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[clue lpSolve proxy RANN survey]; }; + StatMatch = derive2 { name="StatMatch"; version="1.2.4"; sha256="0h5b26qqjpxr9bzrbhmbla24dh3ni4z531951aa1frjvi8krv18r"; depends=[clue lpSolve proxy RANN survey]; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; StatMethRank = derive2 { name="StatMethRank"; version="1.3"; sha256="1jn7xg6f78lhpcd1b2bvjm90yws52klqz625lkwvwfmchwqrxi0i"; depends=[MASS pmr Rcpp rjags]; }; StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; }; Statomica = derive2 { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[Biobase distr fBasics multtest]; }; + SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; - StereoMorph = derive2 { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbfs9jmdbj7cz6jfrckhd8cm2ml922xg4zxrg23cf"; depends=[bezier jpeg png Rcpp rjson shiny tiff]; }; - StockChina = derive2 { name="StockChina"; version="0.3"; sha256="1di5yv7pxgqc2xa1wi3q1x4h2aw45fpbxqbgg3nw4w5vjdcax860"; depends=[]; }; + StereoMorph = derive2 { name="StereoMorph"; version="1.5"; sha256="1y9mflfpysri4abghvp550m1p0r33k75n6q01wihbip157iqf9pz"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; }; + StockChina = derive2 { name="StockChina"; version="0.3.1"; sha256="1myxyfchnkskyqb5yciw1wfk3006f51y89ipzfjzdlfyzwy1lsp1"; depends=[]; }; Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive2 { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; StratSel = derive2 { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[Formula MASS memisc mnormt]; }; @@ -2385,12 +2490,13 @@ in with self; { SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; + SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; }; SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="0.99.2"; sha256="0z9yhaz81l30i7ahjz1gxl7x4c0dqyny8ynpckjm8vwsvpr9y9yf"; depends=[]; }; - SuperLearner = derive2 { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; }; - SuppDists = derive2 { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; }; - Surrogate = derive2 { name="Surrogate"; version="0.1-64"; sha256="151g1a89lwr92r8j46jcvz455ad24ja7ydvqcxyni82r1pqmixda"; depends=[lattice latticeExtra lme4 MASS msm nlme rgl survival]; }; + SuperLearner = derive2 { name="SuperLearner"; version="2.0-19"; sha256="0dp4gqhvksw83asnbf46yd4z1yr1x4yd6b9c8gqjxkwp7bd0kgwb"; depends=[cvAUC nnls]; }; + SuppDists = derive2 { name="SuppDists"; version="1.1-9.2"; sha256="0pkn1jf94hpilpxh82g0llhk4kdrx0zgvczxx3k24z25m6f5kk7h"; depends=[]; }; + Surrogate = derive2 { name="Surrogate"; version="0.1-69"; sha256="04r1zbw8zxbzwfh73s48hpvvbd34073xgmqkpsg2g9xyg9ispzn8"; depends=[lattice latticeExtra lme4 logistf MASS msm nlme OrdinalLogisticBiplot rgl rms survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; }; SurvRank = derive2 { name="SurvRank"; version="0.1"; sha256="1i08yjprzd9irs46rifa5fsmmhwbsf4py0m8qp5rprznyr8504y3"; depends=[doParallel foreach ggplot2 glmnet gplots ipred mboost randomForestSRC reshape rpart sampling survAUC survival]; }; @@ -2405,7 +2511,7 @@ in with self; { SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; - TAM = derive2 { name="TAM"; version="1.15-0"; sha256="0ybm9msic1pai11dxkpc3pskbakjs4rjm4ic87in2c512gp5669m"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; }; + TAM = derive2 { name="TAM"; version="1.17-0"; sha256="1xi5i79s7wrsfds3pn1lzla82qnb8miw8jlb94h6iyy9qr1xgr95"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; }; TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; }; TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; }; @@ -2419,36 +2525,36 @@ in with self; { TDboost = derive2 { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; }; TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; }; TEEReg = derive2 { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; }; - TEQR = derive2 { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; }; + TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; }; TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; }; TExPosition = derive2 { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; }; TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; }; TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; }; TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; - TH_data = derive2 { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; }; + TH_data = derive2 { name="TH.data"; version="1.0-7"; sha256="03h7lr5nh8090w167y3pmpxa0na1mqq4g4k8vz3ypjxc9ls2dq99"; depends=[MASS survival]; }; TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; }; TInPosition = derive2 { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; }; TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; }; TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; - TMB = derive2 { name="TMB"; version="1.6.5"; sha256="0m3hh1rwxq86hrykdv233rzmc5nm73rr1bg72d2qg4giipmv8l5d"; depends=[Matrix RcppEigen]; }; + TLdating = derive2 { name="TLdating"; version="0.1.1"; sha256="1c2879981fs7c5yvh0arpnlx1rb8pi9gvn3g71fv486dzd83gknm"; depends=[gplots Luminescence]; }; + TMB = derive2 { name="TMB"; version="1.6.6"; sha256="0sxkzfdgjqy9pjkmmk1bxlsxfq25lqh5h3nd5ydv2rivnak2jp3g"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; TP_idm = derive2 { name="TP.idm"; version="1.0"; sha256="1dgcalzhkhj4cn1yjf23q6cm527fgf083n7nw7201824g78566n5"; depends=[]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; }; - TRADER = derive2 { name="TRADER"; version="1.2-0"; sha256="1pbj7c2l6w7xk5xghy7q0m2inzr36r9l1if98xyzvyc7zi5pz711"; depends=[dplR]; }; + TRADER = derive2 { name="TRADER"; version="1.2-1"; sha256="01pv2bbz3w880pl15fspj22k7ji2lhk5xxav81j4aqm24hr4l0dp"; depends=[dplR]; }; TRAMPR = derive2 { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; - TROM = derive2 { name="TROM"; version="1.1"; sha256="090m6l9x3q203mb6c454ign82zwcxk2appx0z3kr7bqrap245s7n"; depends=[AnnotationDbi gplots gtools lattice openxlsx RColorBrewer topGO]; }; + TROM = derive2 { name="TROM"; version="1.1"; sha256="090m6l9x3q203mb6c454ign82zwcxk2appx0z3kr7bqrap245s7n"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; }; TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; - TSEN = derive2 { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-3"; sha256="00panrsz9l0r1s2mb458nzqld1gqsax1vyq1a0iz1pi5dlnz6gkp"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-4"; sha256="17gv6kg0v8zirmgrmi61b3phjdb237z3jj5wxz1yn2m94halcnlj"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; TSPred = derive2 { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; }; TSSQLite = derive2 { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; }; @@ -2458,30 +2564,31 @@ in with self; { TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; }; TSdata = derive2 { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; }; TSdbi = derive2 { name="TSdbi"; version="2015.7-1"; sha256="00dasnkkxw9rg1wyx1i2sqjr0ys1ahp9z6rdr08f8wl7zw5r8x6w"; depends=[DBI tframe]; }; - TSdist = derive2 { name="TSdist"; version="3.1"; sha256="0kwj1l45qv2iwf14rad71381ajnq2ikz7kkgal25y3d528q4nd6y"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; + TSdist = derive2 { name="TSdist"; version="3.2"; sha256="085s7d4h777iifvfchsss41lhr7vrm5i0lmpvri6yaw3lsab4r90"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; }; TSmisc = derive2 { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; }; TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; }; TSsdmx = derive2 { name="TSsdmx"; version="2015.12-1"; sha256="0vl2p1n6jmq4q17fdni1w5vrqyyf71b3g06nzgj03sbxiia20cz2"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; TSsql = derive2 { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; }; TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.2"; sha256="00lzzarnpvb5dl4wzch1ll42wzcd2hc3xdi6fkgyiznx0nljapmg"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 wq]; }; - TTR = derive2 { name="TTR"; version="0.23-0"; sha256="1p648hdjdnda6c2vcrp6rf9x2gx8nks3ni8pjlkm2cm7fnbfrcj1"; depends=[xts zoo]; }; + TTR = derive2 { name="TTR"; version="0.23-1"; sha256="1bmj0ngd3i3a9l2zsanifq3irz3rhsyd2rvvlhyndsgadkq9i5v9"; depends=[xts zoo]; }; TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; - TUWmodel = derive2 { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; }; + TUWmodel = derive2 { name="TUWmodel"; version="0.1-6"; sha256="1i986ra0hdhr3nvh9izg6ym69sg2qp4x7b9kx4x86qgi8w43slvh"; depends=[]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; }; TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; }; TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; + Tariff = derive2 { name="Tariff"; version="1.0.1"; sha256="1jjg6qp6n9788w1snl7jsxdg168bbhskdp5wpqqbvcm651rb6d05"; depends=[]; }; TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; }; - TauStar = derive2 { name="TauStar"; version="1.0.0"; sha256="0k8vb9c0w643ssywlkw8dglvzb1p86hf4vgsfasrksxx6yxq5ahv"; depends=[Rcpp RcppArmadillo]; }; - Taxonstand = derive2 { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxajw1rkraiy27km6q4mqsdsq1yfdl1wxv7m0sl"; depends=[]; }; + TauStar = derive2 { name="TauStar"; version="1.1.0"; sha256="1z5n1wfzc9c6zlxbr1vszp492vlq105p28n8jf5gkzsjraznk9zv"; depends=[Rcpp RcppArmadillo]; }; + Taxonstand = derive2 { name="Taxonstand"; version="1.8"; sha256="1lxnfzg6r0ak1c1xrgakcbqnqpg1vqni5xh6hk89xxbdl8zgaa91"; depends=[]; }; TcGSA = derive2 { name="TcGSA"; version="0.10.1"; sha256="05cghnxn5r0ldr8cw371bz0iqx2b73b2qa77xj78xj7a950yvxhw"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; - TeachingDemos = derive2 { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; }; + TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; }; - TestScorer = derive2 { name="TestScorer"; version="1.7.1"; sha256="0zfabkgpwgrr41x033j065hdf1vc2sg4bj9yqfdc6g1pq9kxdmd4"; depends=[]; }; + TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; }; TextoMineR = derive2 { name="TextoMineR"; version="1.1"; sha256="0pdf3zd1glbwqm1lwvv6mcn1pd9phrg5vdwxr2lhh22xsmggswjp"; depends=[FactoMineR gdata MASS stringr tm]; }; @@ -2493,6 +2600,7 @@ in with self; { ThresholdROC = derive2 { name="ThresholdROC"; version="2.3"; sha256="08bmjsbwndb5i902plsy1wa5c1i5f96r3s6fdy0a16w9n6rvll1k"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; + TideCurves = derive2 { name="TideCurves"; version="0.0.1"; sha256="0xpb5xf7ipfnfrrc7j5gsvkn6njqz3ral9nim5gqqfgbnhxkvk1b"; depends=[chron data_table fields]; }; TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-0"; sha256="0inqwa2y4pqs1g9d5m5y6w9j1kgc9qil6gmcilhkjrk886whf622"; depends=[]; }; TideTables = derive2 { name="TideTables"; version="0.0.1"; sha256="08c1fbwxc2kc3vicjdw8qg452y8jrsgyi6b4qbnpb8j6nj91qcx3"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; }; @@ -2502,19 +2610,20 @@ in with self; { TimeWarp = derive2 { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; }; - Tmisc = derive2 { name="Tmisc"; version="0.1.2"; sha256="1av53zzkspc58riqi4kilq526wp6hwig2bv6gp2z5mgiqvfnhdfj"; depends=[dplyr]; }; + Tmisc = derive2 { name="Tmisc"; version="0.1.5"; sha256="17z3l8q86rd683ljiamc56a94ivbl6n4dyzxc3ppmnfy5m6ybv0p"; depends=[dplyr]; }; TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; }; - TraMineR = derive2 { name="TraMineR"; version="1.8-11"; sha256="1a7q6x173wk5v5wqdrz08gbwv6rlcw8wx92m7jwi5h3haza6gbqz"; depends=[boot Hmisc RColorBrewer]; }; + TraMineR = derive2 { name="TraMineR"; version="1.8-11.1"; sha256="037l0857vv51n3046vrcsxrc24hljwr7ya1q3d6cbw9la1qv5f0d"; depends=[boot Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; TransModel = derive2 { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; }; + TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; TransferEntropy = derive2 { name="TransferEntropy"; version="1.2"; sha256="11hwfbf53y88cpm693742hfzzpfwldwxag5860bv0h5r538aqini"; depends=[BH Rcpp]; }; - TreatmentSelection = derive2 { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; }; + TreatmentSelection = derive2 { name="TreatmentSelection"; version="1.2.0"; sha256="10b9saa15mcsmzsxmg79hs8kmdn6by1b1j889105qii62cd0pzdl"; depends=[ggplot2]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; TreeSim = derive2 { name="TreeSim"; version="2.2"; sha256="1c61afb49kjlfb6iy69vk2bgl20g8bhsbwnai2d2shmv1nimi5jf"; depends=[ape geiger laser]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; - TriMatch = derive2 { name="TriMatch"; version="0.9.6"; sha256="09i1h5q8irlkgnhhljh4i1l13mikjidn2asz5gkqqzhr69nylj2z"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; }; + TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; }; TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 plyr reshape2]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; }; @@ -2523,11 +2632,12 @@ in with self; { TunePareto = derive2 { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; }; TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; - TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.4"; sha256="0i62gyailjq9by6hmgvvhpwxsj6q8z3v313wgvi5q2zsicb87fzk"; depends=[survival]; }; + TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; }; + TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; }; UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; UNF = derive2 { name="UNF"; version="2.0.1"; sha256="1gnzj7lxfp0x5f2ws9aclzaq75gbmsqhjqi02llmihf05gq0kp23"; depends=[base64enc digest]; }; UPMASK = derive2 { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[DBI MASS RSQLite]; }; - USAboundaries = derive2 { name="USAboundaries"; version="0.1.1"; sha256="18bk37lhrlp5j0496n956881zl88inliylmgh1p2nlkv4f195yd0"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; }; + USAboundaries = derive2 { name="USAboundaries"; version="0.2.0"; sha256="1if3wf22h395iqcn1n5rfnacwhxd3mpmbvygdwbs2amk55r18vg4"; depends=[sp]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; }; UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; }; @@ -2535,17 +2645,18 @@ in with self; { UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.0"; sha256="18xg1z41nccwzn9mdzpap41ffp4cmfww8bwk10m1v96acf9kq2i5"; depends=[coda gtools]; }; UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; - Unicode = derive2 { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; }; - UpSetR = derive2 { name="UpSetR"; version="1.0.2"; sha256="17gdx0f3szb16c0yhii53wi9gzp5c7f5fvr7mya2xwvd6zmsyd03"; depends=[ggplot2 gridExtra plyr]; }; + Unicode = derive2 { name="Unicode"; version="8.0.0-1"; sha256="0mhr0hirllcr55y92hywsx2xw0l4jyaq3dahlcpkypa3c19nx631"; depends=[]; }; + UpSetR = derive2 { name="UpSetR"; version="1.1.1"; sha256="1ygrjim2r2ff98dmksrdzlhgyh64xm6ryl79g25v9mxa2pygpc3k"; depends=[ggplot2 gridExtra plyr]; }; UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; }; - V8 = derive2 { name="V8"; version="0.9"; sha256="0pfxp4ib44fhndcpy7h7v58d60yb46nqfpwil39g4xybxrp4k4wn"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="1.0.0"; sha256="1d9smhmcmmc1mlkj8zx9nix7isd81589r3qdw4s2hqkjwvzdkcca"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; + VARSEDIG = derive2 { name="VARSEDIG"; version="1.1"; sha256="0fhn0r548k6xkm61bvl1bz81x284qycmc4ccql1g9770q68695va"; depends=[ade4 adehabitatHS car IDPmisc kulife MASS]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; }; VBmix = derive2 { name="VBmix"; version="0.3.1"; sha256="0gicp470w6xy2z4r54ywjd4c9cck2yhhw7ismdp4jm9zsvc7nv1y"; depends=[lattice mnormt pixmap]; }; VCA = derive2 { name="VCA"; version="1.2.1"; sha256="0jwqwrjl7wl4358yrz5ab9a5hp9vd9apsxi5is6rlkswlam33hls"; depends=[Matrix numDeriv]; }; VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; - VGAM = derive2 { name="VGAM"; version="1.0-0"; sha256="1q82zb8p8vygldnlxa54dhmagsqc2s9ybbvhb1b7r66097dxgkba"; depends=[]; }; + VGAM = derive2 { name="VGAM"; version="1.0-1"; sha256="1sh5gb4glnl84iiz33dnwmb37y1wpafjja1s70zy5kkg8178crn0"; depends=[]; }; VGAMdata = derive2 { name="VGAMdata"; version="1.0-0"; sha256="1ywqmfn469hpw9h07raxxrw2wc736i3wbxq2vq31qll4shqnc4q3"; depends=[]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; @@ -2555,14 +2666,15 @@ in with self; { VIMGUI = derive2 { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[Cairo foreign gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; }; - VNM = derive2 { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; }; + VNM = derive2 { name="VNM"; version="4.1"; sha256="1vmdm4f7y69imsbxnd7q85q1ygcyl94pq5n7f33d0sd8rw51dmdj"; depends=[Rcpp]; }; VPdtw = derive2 { name="VPdtw"; version="2.1-11"; sha256="0qsw5mqv36k8mcvwj1ka41z5kc05yn79wv41ai8f5412sbngihlr"; depends=[]; }; + VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; VSURF = derive2 { name="VSURF"; version="1.0.2"; sha256="1wrvgymwh2mgxrsciy62ib7lf9jyc5w9ga3s88cvcrvinagl21xs"; depends=[doParallel foreach randomForest rpart]; }; VTrack = derive2 { name="VTrack"; version="1.11"; sha256="1w8zp7l60mwzppg3gqq0zv5a065y0vdrp2v0x0yl4a8jq0zlvppx"; depends=[doParallel foreach plotKML sp spacetime]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VarSelLCM = derive2 { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; - VarfromPDB = derive2 { name="VarfromPDB"; version="1.1.0"; sha256="0j2f9ymzrcbrjvbqppr2bfyn37yhmjrz17vficnpkgawj2g6jnyj"; depends=[RCurl stringr XML XML2R]; }; + VarfromPDB = derive2 { name="VarfromPDB"; version="2.0.5"; sha256="1wni4ywwkqp1kd82prrzzxjw8ljacq5d7lb751gyg4jrpcsdclr5"; depends=[RCurl RISmed stringi stringr XML XML2R]; }; VariABEL = derive2 { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; }; @@ -2570,44 +2682,53 @@ in with self; { VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; }; VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; }; VennDiagram = derive2 { name="VennDiagram"; version="1.6.16"; sha256="180w0bbfzms12w5s23rbndk413ly5bmdia5qnj0025hicfbh9wvx"; depends=[futile_logger]; }; + VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; + ViSiElse = derive2 { name="ViSiElse"; version="1.0.1"; sha256="1fqk9dcf1fkk7lk7b3iicvxd67q04mmqdf3zggj3cgw6jimx7ba7"; depends=[chron colorspace Matrix stringr]; }; VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; }; VineCopula = derive2 { name="VineCopula"; version="1.6-1"; sha256="1yxsn6n5fd6n155jpk72wn09fw6x85m0kpdm4gbng8jdz5x4b49d"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; }; + VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; }; VizOR = derive2 { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; }; Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-5"; sha256="1d4qpz6a984jv3p0l1w4xdhfx5iz9njz3dxlp0llyfzqg1szbqzj"; depends=[curl xml2]; }; - WARN = derive2 { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; }; + WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; }; + WARN = derive2 { name="WARN"; version="1.2-0"; sha256="0iamg0jh11ydy04mp3vn6zjhr89454m78iz5mmyfywf0s5415san"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; }; - WGCNA = derive2 { name="WGCNA"; version="1.49"; sha256="1jv6mx3pwl352kmq1wkd0gbyl405gky7h37d30ic8gk7i4cjda9r"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore survival]; }; + WGCNA = derive2 { name="WGCNA"; version="1.51"; sha256="0hzvnhw76vwg8bl8x368f0c5szpwb8323bmrb3bir93i5bmfjsxx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore survival]; }; + WHO = derive2 { name="WHO"; version="0.1"; sha256="0szyzf8048czq8yh2wbck80qmnsgrzg7ik5zp7l71rzgjpcyf8hm"; depends=[dplyr httr]; }; WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; }; WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; WRS2 = derive2 { name="WRS2"; version="0.4-0"; sha256="11yfq8jkr2f28zmshkvjv0ajslh0137mprn9clgala8y4xrpqv94"; depends=[MASS plyr reshape]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; - WaterML = derive2 { name="WaterML"; version="1.5.0"; sha256="1fdf8lam31fbxl8ink8hm1rqs1jr0p4xxm2vkin3i8k1cxj42zwi"; depends=[httr RJSONIO XML]; }; + WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; }; + Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; }; + WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; + Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WhatIf = derive2 { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; }; WhiteStripe = derive2 { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; }; WhopGenome = derive2 { name="WhopGenome"; version="0.9.3"; sha256="1lalx3vr8n66nb84psjvc1mgi1rp7g1bylhxr93yyp5w4lwcfv77"; depends=[]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.3.0"; sha256="0db7h357h3g7y5qw8f8lgjkv48nayc9p7alr468r9lpn2kk7z54j"; depends=[FAdist wavethresh]; }; - WikidataR = derive2 { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; }; - WikipediR = derive2 { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; }; - WikipediaR = derive2 { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; }; + WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; }; + WikidataR = derive2 { name="WikidataR"; version="1.0.1"; sha256="1c1mckbfyya9i2xd2a46fwfqyydxb6ayrlzgic2l12m5gdkzbxnr"; depends=[httr jsonlite WikipediR]; }; + WikipediR = derive2 { name="WikipediR"; version="1.3.0"; sha256="0ccxbz1vmfl73v6xcfpwnaxphdc7mcif09i4sk9nd58r1isbbhxn"; depends=[httr jsonlite]; }; + WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; - WrightMap = derive2 { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; + WrightMap = derive2 { name="WrightMap"; version="1.2"; sha256="0d57wq639wgbs1kpr3ilzw70c3rz1i055n3flbyzvy49z9ghvcyp"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.5.7"; sha256="07w2g5igffvymzax85v3xqmfdqx74yslbkvrp5x3c0nl6d185i36"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="0.6.1"; sha256="0nshs1c00f2cw7wmrphz1833gd336bckqa9h0q90hxj388kwis3y"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XLConnect = derive2 { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; }; XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; - XML = derive2 { name="XML"; version="3.98-1.3"; sha256="0j9ayp8a35g0227a4zd8nbmvnbfnj5w687jal6qvj4lbhi3va7sy"; depends=[]; }; + XML = derive2 { name="XML"; version="3.98-1.4"; sha256="09hiy5a875v2fhsgrsfymrwccn9249wnnsr6ck2slrig65svq2lw"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; }; @@ -2621,25 +2742,24 @@ in with self; { ZIM = derive2 { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; }; - Zelig = derive2 { name="Zelig"; version="5.0-9"; sha256="12x3505pm3gwkwb79yxsz6qmryicnrjwc8bxc0p52m6r8hc7dmdc"; depends=[AER Amelia dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack plyr quantreg sandwich survival VGAM]; }; + Zelig = derive2 { name="Zelig"; version="5.0-11"; sha256="134s2d3038b8j2j6xsh0a3parzpqsr50vi67nfjpsxm27qrih27y"; depends=[AER Amelia dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack plyr quantreg sandwich survey survival VGAM]; }; ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-0"; sha256="0mp59mkfbvayml3118kaxsvdqzh7mycnd27fy9dahapvb9qj408l"; depends=[dplyr jsonlite MASS VGAM Zelig]; }; - ZeligMultilevel = derive2 { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[lme4 Zelig]; }; aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; }; - aLFQ = derive2 { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; - aRpsDCA = derive2 { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; }; + aLFQ = derive2 { name="aLFQ"; version="1.3.3"; sha256="0ar325hwzmldviq7f8c478z95xlamvhwwmqs2fv6p3cx7l9k0kz6"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; + aRpsDCA = derive2 { name="aRpsDCA"; version="1.0.2"; sha256="1h1gkk5i77f9dl77dgw2vlm0s7mkmpc4dhcw5mdggyxx944kg33s"; depends=[]; }; aRxiv = derive2 { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; }; - aSPU = derive2 { name="aSPU"; version="1.39"; sha256="1jkgjmaawncs8vr9pwrf2y4hf7jnhmr2d2lhw420c8gwxfaszxyk"; depends=[gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; }; + aSPU = derive2 { name="aSPU"; version="1.41"; sha256="1p9rfph1s2gwgi5vf2clqgy3mnh19ffxmpgg09q8x46g62dg35yw"; depends=[gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; }; aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; }; - abbyyR = derive2 { name="abbyyR"; version="0.2.3"; sha256="11qscym5wv8c4c8akapkhbl8xndxfx5c97mzw0l3zzgf4vdns71p"; depends=[curl httr readr RecordLinkage XML]; }; + abbyyR = derive2 { name="abbyyR"; version="0.3"; sha256="0x6c0ika129rgn4im1hhmfchqivdkfawi0sxkhkbxc9k1z41k95i"; depends=[curl httr readr RecordLinkage XML]; }; abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; }; abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; - abcrf = derive2 { name="abcrf"; version="0.9-4"; sha256="1w5390vblcik2b3cbnd5ndrbjp1cb2chnsf96jbjc1sikssmy3l4"; depends=[MASS randomForest]; }; - abctools = derive2 { name="abctools"; version="1.0.3"; sha256="0985sgyz8dqqq59klhriwx5rara838i9ca3s40xhgw46n49q0nd7"; depends=[abc abind plyr]; }; + abcrf = derive2 { name="abcrf"; version="1.2"; sha256="13kfp1v5qimz8raa004f929xaknphjkp5w4kkj008svca3lp3a61"; depends=[doParallel doRNG foreach MASS randomForest]; }; + abctools = derive2 { name="abctools"; version="1.0.4"; sha256="0y03sql473ylwcbiayl7rn4psc7d8ck0z6vbimnwpx73l143jww2"; depends=[abc abind plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive2 { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; }; - abn = derive2 { name="abn"; version="0.86"; sha256="1sqfkm471qxdk7q6i9yw54n357i1frsf8bdh0dgr29ma5nl6yjq4"; depends=[Cairo]; }; + abn = derive2 { name="abn"; version="1.0"; sha256="1nv9ibk9d58njjz24mswhdv7v9bf0icnjvavqyzh1l0g16aw0ih5"; depends=[Cairo]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abundant = derive2 { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.2.4"; sha256="17211jrpkn65p07x1547l650y33k3l8cmjj1jgk485kbr4kdzk99"; depends=[mhsmm nleqslv PhysicalActivity plyr zoo]; }; @@ -2647,17 +2767,18 @@ in with self; { accrual = derive2 { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; }; accrued = derive2 { name="accrued"; version="1.3.5"; sha256="10j8vrjgb43bggkf2gn518ccfard2f071mj6nwsxrzkm00pbx32v"; depends=[]; }; acepack = derive2 { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; }; - acid = derive2 { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; }; + acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; }; acnr = derive2 { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; }; acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; }; acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; }; - acs = derive2 { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[plyr stringr XML]; }; + acs = derive2 { name="acs"; version="2.0"; sha256="0iddpjbswmxgqbly35gw1f9h3kv7yq3y72j9ngzq6xx00jarc3y7"; depends=[plyr RCurl stringr XML]; }; acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activity = derive2 { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; }; - actuar = derive2 { name="actuar"; version="1.1-10"; sha256="1bm61inq8vxics33mj9ix36ibc9qp92q1m3ckha42kw8x521m6l4"; depends=[]; }; + activpalProcessing = derive2 { name="activpalProcessing"; version="1.0"; sha256="1s84z9h68lwfinnr747brwbn4iai1axn7kh5nmlc6h41rchf64ja"; depends=[chron]; }; + actuar = derive2 { name="actuar"; version="1.2-0"; sha256="14zbp152wsrnflj08mj9hxr61lzb6lx4spxyw45l2rs65ahj8hd6"; depends=[]; }; ada = derive2 { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.1"; sha256="0a6hwcr0fg0a99y91i3wxrk6k0f7ldwvz9jr3akmiprc28v8r4zz"; depends=[caret mlbench rpart]; }; adagio = derive2 { name="adagio"; version="0.6.3"; sha256="0f5sn25qx0zmwqphd06qppf9j7annqhqxax3jssg37yqjakbbln2"; depends=[quadprog]; }; @@ -2666,13 +2787,14 @@ in with self; { adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; }; + addhaz = derive2 { name="addhaz"; version="0.3"; sha256="1jkj5ldxlzz3cb87v2syzvzs0fwlc6dpjnapqkhfaqh1pvmwgnwi"; depends=[boot MASS Matrix]; }; addhazard = derive2 { name="addhazard"; version="1.0.0"; sha256="178rn3md0pgbg9nimvypj4c3paq3bgh2h06vqj3p0n78hrwf97rl"; depends=[ahaz rootSolve survival]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; }; - ade4 = derive2 { name="ade4"; version="1.7-3"; sha256="15xqv9rdp9ni02d67gkdli1v2zzy7fdhy1d8qf7c88qkvrdsq4g9"; depends=[]; }; + ade4 = derive2 { name="ade4"; version="1.7-4"; sha256="17sbicash7z4b63dlrbaf8xx2pbwh62vykzvhdjs43h8jkl881y7"; depends=[]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; }; - adegenet = derive2 { name="adegenet"; version="2.0.0"; sha256="10y4l06k2g42s4vf394dx7pdsqsl0ff2w58mzap1khj90pxyrxdz"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep]; }; - adegraphics = derive2 { name="adegraphics"; version="1.0-4"; sha256="0hh4z2v3p4971b18zv3qdxh9ci573ds85vd2khdjz6lxv3bain4i"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; }; + adegenet = derive2 { name="adegenet"; version="2.0.1"; sha256="045vc1s1n4ihw9id02c3w315pgfr004was2b0d6xb07ncipg9pby"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; + adegraphics = derive2 { name="adegraphics"; version="1.0-5"; sha256="023ii21r3abw78wl1xjmn40rz2dplk3a402618xpwjk93ah74kgc"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; }; adehabitat = derive2 { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.14"; sha256="0ljmn4zbg2lb5b2ckddbxd7ibbib1pzv4iv0ld2k3bv1mvn2j565"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.12"; sha256="06lrg1s3l7slbff17my62ap7mn6h3p6s8jnn7j8mrs48nvim00z9"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; @@ -2685,19 +2807,21 @@ in with self; { ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; }; adwave = derive2 { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; }; aemo = derive2 { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; }; - afex = derive2 { name="afex"; version="0.15-2"; sha256="0fcrl3lmrrdp1x4rxghfrmpa1v0pz87kwwmbqmg2qpvvzib8r9fa"; depends=[car coin lme4 lsmeans Matrix pbkrtest reshape2 stringr]; }; + afex = derive2 { name="afex"; version="0.15-2"; sha256="0fcrl3lmrrdp1x4rxghfrmpa1v0pz87kwwmbqmg2qpvvzib8r9fa"; depends=[car coin lme4 lsmeans Matrix reshape2 stringr]; }; aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; }; agRee = derive2 { name="agRee"; version="0.4-0"; sha256="19nvn2hiijn81wgqhx7s6blr2ilzx6p2s2qx1lw9shmnsmyywmss"; depends=[coda lme4 miscF R2jags]; }; agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; }; agricolae = derive2 { name="agricolae"; version="1.2-3"; sha256="0lly0dpdmc2kk843mdpj7gawffysf2yc31shsyhqlnf0sibblmik"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; }; - agrmt = derive2 { name="agrmt"; version="1.39.3"; sha256="0cnhaja75am0cpjapkl2b6y14q6s4dg7s8p2hqn0610axf58yxp9"; depends=[]; }; + agrmt = derive2 { name="agrmt"; version="1.40.1"; sha256="06pd9svpvw38x5skdqz6fhax92wgrxjkdpw5qfph4hgqx53dxz9p"; depends=[]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; + ahp = derive2 { name="ahp"; version="0.2.8"; sha256="07h6z4qp0jhfmjavk18cc3j95wg4jyfclpz4rcj93j484qj0f1aa"; depends=[data_tree DiagrammeR formattable yaml]; }; aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; akima = derive2 { name="akima"; version="0.5-12"; sha256="10lbx69val6ysy6gk5nn1nl0ldgg90xfnj5snf9kdixfapi8vxnk"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; + alakazam = derive2 { name="alakazam"; version="0.2.3"; sha256="0z2kmzv33qyb7iawzndynpl1n395sk05lx3a31qbin6f1yc55lrp"; depends=[dplyr ggplot2 igraph lazyeval scales seqinr stringi]; }; ald = derive2 { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; }; algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; }; alineR = derive2 { name="alineR"; version="1.1.2"; sha256="11ddg93iaq4xpg5rfw8qi82qhnmw6qnbzzsahr80xc0qn3p94i7d"; depends=[]; }; @@ -2708,18 +2832,19 @@ in with self; { allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; alm = derive2 { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 httr jsonlite lubridate plyr reshape reshape2 stringr]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.1.0"; sha256="0agca8dbypp2r08x7b4pscyz280m4l27ckkcvg1plk412v0n8dq8"; depends=[nleqslv quantreg Rsolnp]; }; - alphahull = derive2 { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 sgeostat spatstat splancs tripack]; }; - alphashape3d = derive2 { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; }; + alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; + alphashape3d = derive2 { name="alphashape3d"; version="1.2"; sha256="1apbirffqipdj618qgqh7vjlhg9fp6ncxb0yk4dclpn7g645863x"; depends=[geometry rgl]; }; alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; + altmeta = derive2 { name="altmeta"; version="1.0"; sha256="1rca3qkx8ba39qjf35wmshdgdx0wmkpcmid22fvjbkkl8vr2m4h3"; depends=[]; }; amap = derive2 { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; }; - ameco = derive2 { name="ameco"; version="0.1"; sha256="1g4zijrlrp4f2zcsbaqi4q2dpv6j51zhgd2mxvhclf66k7wv4qim"; depends=[]; }; + ameco = derive2 { name="ameco"; version="0.2.2"; sha256="1r2gnd4mq3vdil8igh5n50yldz0g8g3syv4xv757fymwg6w7lk7g"; depends=[]; }; amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; amen = derive2 { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; anacor = derive2 { name="anacor"; version="1.0-6"; sha256="0nq3jhai586d3980y8raqmbhh8snd5bpx5z8mlwrxvkmr62hcrpl"; depends=[car colorspace fda rgl scatterplot3d]; }; analogsea = derive2 { name="analogsea"; version="0.3.0"; sha256="14mh9lbbzxv75aprm2gixz05pyy5lh46ysflkdnnnpj2c5mpj2k9"; depends=[httr jsonlite magrittr yaml]; }; - analogue = derive2 { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[brglm lattice MASS mgcv princurve vegan]; }; + analogue = derive2 { name="analogue"; version="0.17-0"; sha256="00wk4jnzif28ibx9s3m68qdx64ycdgg5yr6ybb0srlydikvf1sy8"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[analogue rgl vegan3d]; }; analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anametrix = derive2 { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[pastecs RCurl XML]; }; @@ -2743,8 +2868,8 @@ in with self; { apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; apaStyle = derive2 { name="apaStyle"; version="0.2"; sha256="1vkbjlqn36f51yn7vmrcm74airi3mc5i70h2848gcb87f7zcwbh9"; depends=[ReporteRs]; }; apaTables = derive2 { name="apaTables"; version="1.0.4"; sha256="1ncs79n0jvr6m9gmaazi5d9g2c6c6hf8alrb45z8fy8sj9bj51hn"; depends=[car MBESS rockchalk]; }; - apc = derive2 { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; }; - apcluster = derive2 { name="apcluster"; version="1.4.2"; sha256="1rjqjy7wc6cip9pnbz6sfwr0df0nipy02d48ngkwndph6ywf45y2"; depends=[Matrix Rcpp]; }; + apc = derive2 { name="apc"; version="1.2"; sha256="1977d17sxky256jdh0ikyrm3d7kdn4kl5170jxc63nwdfnmh2ns3"; depends=[lattice]; }; + apcluster = derive2 { name="apcluster"; version="1.4.3"; sha256="1pqcxh83189388qqc6cngqnsygvpx4kjy0j2r8ykcgxvdwi8r58m"; depends=[Matrix Rcpp]; }; ape = derive2 { name="ape"; version="3.4"; sha256="11cfw02gm5i21p4k7c8sfg9xmzg57bn9n6zr2j1wryily31gifsz"; depends=[lattice nlme]; }; apex = derive2 { name="apex"; version="1.0.1"; sha256="188hczb39dqi6xq2hbwhgas9jj9y7bbcsdz0kczimkbqwd9rz7cp"; depends=[adegenet ape phangorn]; }; aplore3 = derive2 { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; }; @@ -2759,14 +2884,15 @@ in with self; { aprof = derive2 { name="aprof"; version="0.3.1"; sha256="1zlpx72lhrc0jwfr4qydh64gvmwy52krfym1slz51r51w31q84x9"; depends=[]; }; apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; - apt = derive2 { name="apt"; version="2.4"; sha256="1rmzc900c97bgcm6mh0lykqj14h8wgwbs4hszf2ar1pzwxkb7q26"; depends=[car copula erer gWidgets urca]; }; + apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; }; aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; aqp = derive2 { name="aqp"; version="1.9.3"; sha256="0805d05dvid7s67anlrw61bsdz21hii2c41ar9q8377rzvb4cfsd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; archdata = derive2 { name="archdata"; version="1.0"; sha256="1hs2pgdaixifqjnwcbrjxlrzng0r2vmv6pdzghsyvzlg28rnq2rk"; depends=[]; }; archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; - archiDART = derive2 { name="archiDART"; version="1.2"; sha256="0kshyad4bhmiry5avkvmnlv5nhpyb1pbb0s9yviazcvj2yx8phwd"; depends=[XML]; }; - archivist = derive2 { name="archivist"; version="1.8"; sha256="0xafdsada1d5gq4k004s851q9gd8xl96qfxgmm2ss0i53a7a31jw"; depends=[DBI digest git2r httr jsonlite knitr lubridate magrittr RCurl RSQLite]; }; + archiDART = derive2 { name="archiDART"; version="1.4"; sha256="1ymk56w07jj51p2r4g7qa4a3nyhnjrbn6igxgn6644mm0v118b8h"; depends=[XML]; }; + archivist = derive2 { name="archivist"; version="2.0.3"; sha256="13yncsy3g213d9x6wsm05kaxkccfwwa6l9phc13asajw7dyiwirb"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; }; + archivist_github = derive2 { name="archivist.github"; version="0.1"; sha256="0s6b5fcghm307n0z4pa6m1kg9a3w1cnlhy1hcs36pmbvlid6xva6"; depends=[archivist digest git2r httr jsonlite]; }; arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive2 { name="arfima"; version="1.3-4"; sha256="0348zkr8h5la1vh66fifl1fn21hp03k34zv5ga29crmwvvsvk8pi"; depends=[ltsa]; }; argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; @@ -2774,30 +2900,31 @@ in with self; { argparser = derive2 { name="argparser"; version="0.3"; sha256="1lwlkrh8hq4p02jmb76nss9qjrgyf5fqqzifv9z8ff1lk7szgmy4"; depends=[]; }; arm = derive2 { name="arm"; version="1.8-6"; sha256="1bdjzq1da9nwfll4ial74ln920f2i19n4mwc5f4a5lwqrk4c69c7"; depends=[abind coda lme4 MASS Matrix nlme]; }; arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; - aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="2.14.0"; sha256="1w751b4g95wclxdgjk0z2g5v46v0znj7d7r4qrk6axv9a9fasiy4"; depends=[aroma_apd aroma_core MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; + aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.0.0"; sha256="1i6swcg13sajsr2r49ga3qnkiza87ql49v96mjwaj0s5x23szknp"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="2.14.0"; sha256="0f8zfcc262lklj4rk1fxbq7f31n3cdfmzpf574r787kf44ilq94x"; depends=[matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; - arqas = derive2 { name="arqas"; version="1.3"; sha256="0qycn9y08x2p0xwhindzvav5grg2wbz33xqaxqzyh22dikvkdslq"; depends=[distr doParallel fitdistrplus foreach ggplot2 gridExtra iterators reshape]; }; + aroma_core = derive2 { name="aroma.core"; version="3.0.0"; sha256="0y0hydf2b2fp2dn2fqxbdqsf2r04rk7y1s2wwm1dg3p6nzsgnypk"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + arrApply = derive2 { name="arrApply"; version="1.0.4"; sha256="0sm0msprajh6mc36pjc8dkhiqmk6553gra43p5kg444lfw57yd57"; depends=[Rcpp RcppArmadillo]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; }; ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; - artfima = derive2 { name="artfima"; version="1.1"; sha256="1qilb86lbmpm8jrlvv6gf06gsrn2ayvmr3c8y3a82hh2h4skzjs6"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.3-1"; sha256="11js2zghyh3iryaqnx21jmnf4mnfg58nv74lbh21wsx42rb0ah68"; depends=[Matrix]; }; + artfima = derive2 { name="artfima"; version="1.2"; sha256="1a4kagi3lh8fbs75zy30hbd4jcm88a9ngrxj52l97hb910w20wz1"; depends=[gsl ltsa]; }; + arules = derive2 { name="arules"; version="1.4-0"; sha256="1xgawdl3zb4hlydqwqwffjh9d8k1iwpcr43bkhz9v8hs7capn948"; depends=[Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; - arulesSequences = derive2 { name="arulesSequences"; version="0.2-12"; sha256="0bwaqh9p3wjxx3gr84bvd24s1q7vxqplafl0fp17g190fd2x511b"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.1-0"; sha256="0kapvhrbxsn8pw6gfabnswzzgwgs621riq54xrlswicn5p2ywgxy"; depends=[arules colorspace igraph scatterplot3d seriation vcd]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; - asbio = derive2 { name="asbio"; version="1.2-5"; sha256="05bk84qvqk6mk5xpzbhri60qhpsvza01yk5rni1qj7rxm7lxnmk8"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + asaur = derive2 { name="asaur"; version="0.44"; sha256="08f04vvd0v22l56mq1f0nmpi5qr085kc2lax3yd74jxcybn5nrnk"; depends=[]; }; + asbio = derive2 { name="asbio"; version="1.3-1"; sha256="1avzy32fblvn977ciri96gr1b8iia3yc3546n69c8lvy3ybdp4fb"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; asd = derive2 { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; }; - asdreader = derive2 { name="asdreader"; version="0.1-1"; sha256="0754n0p8zq5bwrcqgpn38yzh9aparqf5lavnclrqhs1zsnd4j36z"; depends=[]; }; + asdreader = derive2 { name="asdreader"; version="0.1-2"; sha256="0lfm0c5nzm276zaaxxwkpkqca5xg9r6ysfpgl6wvdbbvs9s83x4a"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; asht = derive2 { name="asht"; version="0.5"; sha256="04wlvn4j8c8c3sxsa9ydb1garb7px768xvrnr6ywhb722srwi5gy"; depends=[bpcp coin exact2x2 exactci ssanv]; }; + asnipe = derive2 { name="asnipe"; version="0.85"; sha256="0mp8gbi0390hdrdyhsmyj100w1zzzj78cyilkr9fzp176qqy1b6c"; depends=[]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; }; asremlPlus = derive2 { name="asremlPlus"; version="2.0-3"; sha256="0by2d8inwgyi79gqiivgxkm1xxy58jzyp4n76q21kwzqxj8agjgk"; depends=[dae ggplot2]; }; - assertive = derive2 { name="assertive"; version="0.3-1"; sha256="14hycm8y4qgs8k1lx8kh43j6h35akv16mc836arzj5b8fjk90y72"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; - assertive_base = derive2 { name="assertive.base"; version="0.0-3"; sha256="17p2hw5m46gcq3k1msmkf0782hsiaawm4qd45f0fhk5f6j8pl8f2"; depends=[]; }; + assertive = derive2 { name="assertive"; version="0.3-2"; sha256="11zyia1pynr82zc98cdlv7zfpg7ncx0gg2a4ry7sy5n06l4nvcrs"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; + assertive_base = derive2 { name="assertive.base"; version="0.0-5"; sha256="0w43pplkqc51cxpfhni7q4hiqy6pq5s7rhwi9ja73yfglrh1rnrk"; depends=[]; }; assertive_code = derive2 { name="assertive.code"; version="0.0-1"; sha256="0drdrc9ljznkz52lvpwx0mvrghl0wf6dffzc3msz8lnvraxmanyw"; depends=[assertive_base assertive_properties assertive_types]; }; assertive_data = derive2 { name="assertive.data"; version="0.0-1"; sha256="0pjw7rf76d99awd8i4krmhbyks39lx89c9pb4j49nmz3w6x3z233"; depends=[assertive_base assertive_strings]; }; assertive_data_uk = derive2 { name="assertive.data.uk"; version="0.0-1"; sha256="0z2hpvfl34zzy9sncmihcj1ir5nnm9d05j7ip7j83by2pfwsjdhf"; depends=[assertive_base assertive_strings]; }; @@ -2807,14 +2934,15 @@ in with self; { assertive_matrices = derive2 { name="assertive.matrices"; version="0.0-1"; sha256="1vk0i860r87rc5x0navai8xx9ixqyp96waxlk6j5p8y8hrpiyyif"; depends=[assertive_base]; }; assertive_models = derive2 { name="assertive.models"; version="0.0-1"; sha256="1pkyssavld57njmv545bfa3a7dmyrgpsvr9vdhqmrmcpc55w89cj"; depends=[assertive_base]; }; assertive_numbers = derive2 { name="assertive.numbers"; version="0.0-1"; sha256="0wsnk6nxcxhbq09gzrp3g7l4nzxyhkbxiyv4yzh1hqqqry066hsa"; depends=[assertive_base]; }; - assertive_properties = derive2 { name="assertive.properties"; version="0.0-1"; sha256="1rv13xpw2igshmrls5a5cxh3crqi0fkfk1fiwrb0yi03kn4d0lhl"; depends=[assertive_base]; }; - assertive_reflection = derive2 { name="assertive.reflection"; version="0.0-1"; sha256="1lrp4srqm0gryxvs4b48vyb6skwbz0pcc0020k7366lxvdazxnsh"; depends=[assertive_base]; }; - assertive_sets = derive2 { name="assertive.sets"; version="0.0-1"; sha256="00wvn4xkfxjcwja023671ag7zlr6dc96i60zm0vqx0gsq8ra8vs6"; depends=[assertive_base]; }; - assertive_strings = derive2 { name="assertive.strings"; version="0.0-1"; sha256="17mlpl348s4pg6m7vnb17wabfqx1nfcf0vqpih313d1q8arhmxba"; depends=[assertive_base assertive_types]; }; - assertive_types = derive2 { name="assertive.types"; version="0.0-1"; sha256="0fyvfvyjdnpp0n99khs5qx0dyqal0l3bnl7p0byl794jaqas5s2c"; depends=[assertive_base assertive_properties]; }; + assertive_properties = derive2 { name="assertive.properties"; version="0.0-2"; sha256="1bh9h56zq6yrhvsjm9pzdz30f2hb1k51rvsn9y1ifhn8syvzvpnf"; depends=[assertive_base]; }; + assertive_reflection = derive2 { name="assertive.reflection"; version="0.0-2"; sha256="1mr1fi3ij8srpgl812imi0jyi44gnyhrrr4x5s1lwn4mwzjw657r"; depends=[assertive_base]; }; + assertive_sets = derive2 { name="assertive.sets"; version="0.0-2"; sha256="0azs5nqzm03m1f5yhci49y51phnw85yk2yk9a8qka3mcd0kin9rw"; depends=[assertive_base]; }; + assertive_strings = derive2 { name="assertive.strings"; version="0.0-2"; sha256="0181mj61fjj3gz74zwr6cb4mq7fclsbyh1zdlnpfmy3vzpmcpsb5"; depends=[assertive_base assertive_types]; }; + assertive_types = derive2 { name="assertive.types"; version="0.0-2"; sha256="0s2yq8ycrmpr5m35psz4546shrcp5q1rz28pmh3s5f5y7gvqidxa"; depends=[assertive_base assertive_properties]; }; assertr = derive2 { name="assertr"; version="1.0.0"; sha256="0z7cgksjc0a7niar9f26f0512ln0a7cifyqcfrbhar552dnkg33i"; depends=[dplyr lazyeval MASS]; }; assertthat = derive2 { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; }; + assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; aster = derive2 { name="aster"; version="0.8-31"; sha256="1rn9hp7dg81rd14ckmfz23aav3ywm7i3w46jx66kqbrfs7kdrslq"; depends=[trust]; }; aster2 = derive2 { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; }; astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; }; @@ -2823,6 +2951,7 @@ in with self; { astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; astsa = derive2 { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; }; + asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; @@ -2837,48 +2966,51 @@ in with self; { automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; }; - averisk = derive2 { name="averisk"; version="1.0"; sha256="0lgkkgj3hcjhx36nsq7aa3psdb26shiskpmwwglqs6zabw3apxj6"; depends=[MASS]; }; + averisk = derive2 { name="averisk"; version="1.0.1"; sha256="18gr7nv826sxh085rd8vqbg6isbhans47a2prff2rxwy9jjn8dvg"; depends=[MASS]; }; aws = derive2 { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; }; aws_signature = derive2 { name="aws.signature"; version="0.2.0"; sha256="0g2cxhvf27h1in9iwb74y85rg3w4w4py608f2ybdjgix3lxk60ag"; depends=[digest]; }; - awsMethods = derive2 { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; }; + awsMethods = derive2 { name="awsMethods"; version="1.0-3.1"; sha256="0iswk1ijnxwik66crcplldkbfp5flbgk15xap1ys2jp6nwhlw3qw"; depends=[]; }; aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; }; b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive2 { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; }; - bWGR = derive2 { name="bWGR"; version="1.3"; sha256="1zanskirl5g29xf8nb01mvym3iasn853z71rqqzd1xp3ydy5g9lj"; depends=[Rcpp]; }; + bWGR = derive2 { name="bWGR"; version="1.3.1"; sha256="0bfxizypi3nnkv2ycvlvsly9zhf0yyln2x10ayhgxgcj1abmg57y"; depends=[Rcpp]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[edgeR]; }; - babynames = derive2 { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; }; + babynames = derive2 { name="babynames"; version="0.2.1"; sha256="1knzr0pn77k8krinp8pmlzf07v8597g2iby4mayig91cna1m0psx"; depends=[]; }; backShift = derive2 { name="backShift"; version="0.1.3"; sha256="0l4i3z7iwacr64g8n4gwjncxgmkcf5jz2w9l2xy3l90wlnfd15rp"; depends=[clue ggplot2 igraph jointDiag matrixcalc pcalg reshape2]; }; backpipe = derive2 { name="backpipe"; version="0.1.5"; sha256="0syna8mpv4cxx7q4yii14qvnn60mx8nvyjnq81h4ffpavjg6wi6c"; depends=[]; }; + backports = derive2 { name="backports"; version="1.0.2"; sha256="136nyq06f4pincn85xqgqrf6lkhlqx0gynk4bz6d40va85iswwpp"; depends=[stringi]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; backtestGraphics = derive2 { name="backtestGraphics"; version="0.1.6"; sha256="14l9dbkbcx4kl45kpjbq4ihzf47j859khhd1db40vnp8x57g9xcx"; depends=[dplyr dygraphs scales shiny xts]; }; bacr = derive2 { name="bacr"; version="1.0"; sha256="1as9vfzwv8aix44mr0j3av0ghnqmmbcs6w0jpwbjrvxkb7bhxgdm"; depends=[MCMCpack]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; bamdit = derive2 { name="bamdit"; version="2.0.1"; sha256="105y4cayymqhd3f7dk297syv966pba9cjg6dx9jabcximicdw4l9"; depends=[ggplot2 gridExtra R2jags rjags]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; - bapred = derive2 { name="bapred"; version="0.2"; sha256="18vm5ipnajq7d7sbddj88an66ibgl2crq04cj6m7mg37j00mm412"; depends=[FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; + bapred = derive2 { name="bapred"; version="0.3"; sha256="0jfg5cz8ra289z5mym621231cm43472gkiss7j66dbm3i4n94ygj"; depends=[FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; - bartMachine = derive2 { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; }; + bartMachine = derive2 { name="bartMachine"; version="1.2.1"; sha256="0r6gr608y0xb14nlq1smwny79hnij4dmi4jsqxvsf97v3nzbgd4r"; depends=[bartMachineJARs car missForest randomForest rJava]; }; + bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.0"; sha256="1vnicq9amayxh69jqgly8jm7hvgjr22kvm1g6y2n7vphz70p9cq9"; depends=[rJava]; }; base64 = derive2 { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; }; base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; + basefun = derive2 { name="basefun"; version="0.0-30"; sha256="149s2giv1nj2l85lxzalah0c7h441v2kngjv2mj13fl1k8nbxgfl"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; }; - basicspace = derive2 { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; }; + basicspace = derive2 { name="basicspace"; version="0.17"; sha256="1aq2w3lk3ksb60x21cgwayf151nhfcwbcxskbxlgdzs3i2r00b48"; depends=[]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; - bayesDccGarch = derive2 { name="bayesDccGarch"; version="1.2"; sha256="15skkm4vmqj1r0vic1wgr58x8c7p6igvlmafbv0c46yl224qgryv"; depends=[coda numDeriv]; }; - bayesDem = derive2 { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2012]; }; + bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; + bayesDem = derive2 { name="bayesDem"; version="2.5-0"; sha256="0iz4cysiqkyia61mslgbiczsqxlmdism3vkwihm50xly5g1fvhhk"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.0.2"; sha256="1fl1sdila3b7a6ikmay1bxyx6am2mqa9nvf29b9r38002dj5ylz2"; depends=[coda mvtnorm]; }; - bayesGDS = derive2 { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; }; bayesLife = derive2 { name="bayesLife"; version="3.0-0"; sha256="0ssmg5yrwyx53lj8iicpnrngpn8gjdxd47xvndb110k7cqzkfyf0"; depends=[bayesTFR car coda hett wpp2015]; }; bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; }; - bayesPop = derive2 { name="bayesPop"; version="5.4-0"; sha256="0v3k9dp1f8g41zng9w94phpd094y9g7qsnkyx9xw1jslz2f1s048"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012]; }; + bayesPop = derive2 { name="bayesPop"; version="6.0-1"; sha256="0wkvvh7ad484cil736rg54ikcg9gdmpprz5y3ai91jjs7ri4mklw"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012 wpp2015]; }; bayesQR = derive2 { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; bayesSurv = derive2 { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; }; - bayesTFR = derive2 { name="bayesTFR"; version="5.0-0"; sha256="0mg27lcx1ydakakn07sxadfxk2dyk29n222fhpfd5fgbhg72kixc"; depends=[coda MASS mvtnorm wpp2015]; }; + bayesTFR = derive2 { name="bayesTFR"; version="5.0-1"; sha256="0zpjf2r48z9jsp97jml26ax57pc1mbbs2bvsih0b8j384npb95q8"; depends=[coda MASS mvtnorm wpp2015]; }; + bayesboot = derive2 { name="bayesboot"; version="0.2.0"; sha256="0l2wlj8sar1p404ikrq5z4738757cwiq7l2rj8dvxir33v0gil0q"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; bayesm = derive2 { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; }; bayesmeta = derive2 { name="bayesmeta"; version="1.1"; sha256="15f81n8pnrq1s49gw0bzkc8gawn7m2rj5d24bbxak64jkxclgkd9"; depends=[]; }; @@ -2888,10 +3020,10 @@ in with self; { bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; - bbmle = derive2 { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[lattice MASS numDeriv]; }; + bbmle = derive2 { name="bbmle"; version="1.0.18"; sha256="0gcj16msny7ni60r000mv2knb4gxbb470qn16pc6vzdhrl6c6dxj"; depends=[lattice MASS numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; bc3net = derive2 { name="bc3net"; version="1.0.3"; sha256="0plzi5ncm3izw4k97rlyrvbnhc5zcd8mv2ldp3wy9zav0x168jda"; depends=[c3net igraph infotheo lattice Matrix]; }; - bcRep = derive2 { name="bcRep"; version="1.2.2"; sha256="0mr0i23gis65lq65k71jqd35n93vfcx5bz0rbqwl1g2dhn64z68z"; depends=[doParallel foreach gplots ineq vegan]; }; + bcRep = derive2 { name="bcRep"; version="1.3.2"; sha256="0n6pcmmzrl2mv2iw2n7hc32ms6b4gwniwgpmwf4kb92bgi0yjbk4"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; }; bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; }; bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; @@ -2901,9 +3033,9 @@ in with self; { bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; bda = derive2 { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; - bdots = derive2 { name="bdots"; version="0.1.2"; sha256="0gxprhhj0636by7x0l3lzqmpbk149sj4a2j3w57z1wacj3cj02k0"; depends=[doParallel doRNG foreach mvtnorm nlme]; }; + bdots = derive2 { name="bdots"; version="0.1.7"; sha256="053www3dydrzcakv6yb4ymwqhwzb88hxmgnnazzs19gpwmf7fkfm"; depends=[doParallel doRNG foreach mvtnorm nlme]; }; bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; - bdscale = derive2 { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; }; + bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; }; bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; }; bdvis = derive2 { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[ggplot2 maps plotrix plyr sqldf taxize treemap]; }; bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; }; @@ -2915,6 +3047,8 @@ in with self; { beeswarm = derive2 { name="beeswarm"; version="0.2.1"; sha256="07fiapl7pl610h3662jx22914mfvdh4rmnmmzhk2adiyyymclnn2"; depends=[]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; }; + benchmarkme = derive2 { name="benchmarkme"; version="0.2.3"; sha256="05ncmgddq83v1ndcyfa30g367a4rv1zvsxh0sn640c6qx2q1q3xy"; depends=[benchmarkmeData httr Matrix]; }; + benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.2.2"; sha256="0b9m9w9948jga0cxrj9mcp6kxvgwnzr316jiyb988a901jmg04wn"; depends=[]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.3"; sha256="0mhi1yf3p9lffl1mcjsjxn3cay1pcjvpgg39cxr9v0nqpkyycfbh"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; @@ -2931,7 +3065,8 @@ in with self; { bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; }; bfa = derive2 { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; - bfp = derive2 { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp]; }; + bfork = derive2 { name="bfork"; version="0.1.2"; sha256="0gcmvxs57gkyvsx67dyg2jqs9wr3clndmmfqq5rvi5ys31g6krb8"; depends=[]; }; + bfp = derive2 { name="bfp"; version="0.0-30"; sha256="09im14hhykg9a3rfl4pr2af36whpxfh8dvqnsjz88jl0wzw77i3k"; depends=[Rcpp]; }; bgeva = derive2 { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; }; bglm = derive2 { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; }; bgmm = derive2 { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[car combinat lattice mvtnorm]; }; @@ -2942,27 +3077,28 @@ in with self; { bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; }; bigalgebra = derive2 { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; }; - biganalytics = derive2 { name="biganalytics"; version="1.1.12"; sha256="0ajhjszvqxnz01h6awsqkc9bqbpiyzw6lcq7rxn3xfnhm11dqfsv"; depends=[BH biglm bigmemory foreach]; }; + biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; bigdata = derive2 { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet lattice Matrix]; }; biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; + biglasso = derive2 { name="biglasso"; version="1.0-1"; sha256="09yahcklcnrf03rsr2j01gh4n3mlnzjsvv13nlhg48r88r6wizmy"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; - bigmemory = derive2 { name="bigmemory"; version="4.5.8"; sha256="0dqc5h0d0vlw3ladj4b1hnmvzjmlx8gjnxin1igakdf2z5ahyndb"; depends=[BH bigmemory_sri Rcpp]; }; + bigmemory = derive2 { name="bigmemory"; version="4.5.18"; sha256="1yl4izrq00pcsnzji4qx2yfrfk15iwf0v4r8rdm62lbaj0vx3haf"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; }; bigpca = derive2 { name="bigpca"; version="1.0.3"; sha256="0hqkaamj5fyp2jw5727pkvmnqr194ngh4hlja14qmj81nr26a88p"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; }; - bigrquery = derive2 { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[assertthat dplyr httr jsonlite R6]; }; - bigsplines = derive2 { name="bigsplines"; version="1.0-7"; sha256="08ijm5jd7r5p94kj33yvip3xjmgb2w4w6pv13sjyvhp7ahzqgr92"; depends=[]; }; - bigtabulate = derive2 { name="bigtabulate"; version="1.1.4"; sha256="037lym17hlxrjywp3r4hz2b4lszz7pgr8ra4ysgn29h3hb4lsj7g"; depends=[BH biganalytics bigmemory Rcpp]; }; + bigrquery = derive2 { name="bigrquery"; version="0.2.0"; sha256="15hwi4n574j03nh2brr6qyfigkg25mj4pq4fm0igyg45cm3ixdw8"; depends=[assertthat dplyr httr jsonlite R6]; }; + bigsplines = derive2 { name="bigsplines"; version="1.0-8"; sha256="00w8jv5nlkm12djry69w11dzpg85x4ygriq9g9d3x0saisii5x12"; depends=[]; }; + bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; - binaryLogic = derive2 { name="binaryLogic"; version="0.2.6"; sha256="0p6qa50rm2rwn43n1n5kgh58l7186994f6n6zfbsmy4dnn98x3zm"; depends=[]; }; + binaryLogic = derive2 { name="binaryLogic"; version="0.3.2"; sha256="04ghil0h560zm2q4rndyxsxgp9jzh6xx3apx2m8y84p4c9h2q695"; depends=[]; }; binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; }; bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; binequality = derive2 { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; }; - bingat = derive2 { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; }; + bingat = derive2 { name="bingat"; version="1.2.2"; sha256="1vx6zm6vvv7nzp781fa6mb2iq6hmndi5f3yml15ydw4cx3f8r0xd"; depends=[doParallel foreach genalg gplots matrixStats network]; }; binhf = derive2 { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; }; @@ -2977,19 +3113,19 @@ in with self; { bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; biogas = derive2 { name="biogas"; version="1.2.1"; sha256="0prp9s60d133s94n78m2rvlaph98j1xpsw2ykwkp33mq4sgjqbkq"; depends=[]; }; biogram = derive2 { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; }; - bioinactivation = derive2 { name="bioinactivation"; version="1.0.1"; sha256="16k28ylddsn3d3hr1dkd5zqghglyxbdr0vaxcj08qb1vfp9dfnhf"; depends=[deSolve dplyr FME lazyeval]; }; + bioinactivation = derive2 { name="bioinactivation"; version="1.1.2"; sha256="1hcn29nvq9sf3ayc5nlyxiihqacccbqikcxlypxxq5x7kv20ml9a"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS]; }; biom = derive2 { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; }; - biomartr = derive2 { name="biomartr"; version="0.0.2"; sha256="1a2a5jjb132a8ms21cdn9k0csbdypi9jww8j3vkgcr549n55lw0j"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl stringr XML]; }; - biomod2 = derive2 { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; }; + biomartr = derive2 { name="biomartr"; version="0.0.3"; sha256="15ds9518kanr7ifc6xnswmj28asmqh7qm2nz8ll6ak1c97gwllmg"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl readr stringr XML]; }; + biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biorxivr = derive2 { name="biorxivr"; version="0.1.2"; sha256="1715i1wp9ja7ipw3awh9mw5whdnwjygf2m73z4pr2f57wyb11n7f"; depends=[XML]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.0"; sha256="0avn35r567crp3z4i1fvlfirvc085cf3g6znc6wgnm7mhxp3l1ss"; depends=[signal]; }; - biotools = derive2 { name="biotools"; version="2.2"; sha256="0wy8l22p5y8h25gfhq6gbirbd7yi51j8iw24f1jgxl8cv49mczmf"; depends=[boot MASS rpanel tkrplot]; }; + biotools = derive2 { name="biotools"; version="3.0"; sha256="0k5dgaw2ris9vp370d8qhpnvnd0hllac8cv5sp52vgqskwygg7fx"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; bipartite = derive2 { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; }; birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; - birk = derive2 { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; }; + birk = derive2 { name="birk"; version="2.1.0"; sha256="00hzhv209wzgmngaq699f1sr003vwsk9s42s8pkli4qjlwzwqk12"; depends=[]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; }; bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; @@ -2999,7 +3135,7 @@ in with self; { biwavelet = derive2 { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; bizdays = derive2 { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; }; - blavaan = derive2 { name="blavaan"; version="0.1-1"; sha256="0bq6czpi61gmm133q021pz4fpv8ay9s2y2zcpdl24a5rlv6fdzic"; depends=[lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; + blavaan = derive2 { name="blavaan"; version="0.1-2"; sha256="0g04554s11v2nybawvv635dgf3dajh12h2hlxlccjz5rslg27hb8"; depends=[lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; blkergm = derive2 { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; }; @@ -3012,18 +3148,19 @@ in with self; { blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="1.9"; sha256="07xxyi0jsji4dqvm3vgxvxz4dfpfi8vkmk3ypl0h66xlv1j885qb"; depends=[crossdes]; }; - blowtorch = derive2 { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[foreach ggplot2 iterators]; }; - blsAPI = derive2 { name="blsAPI"; version="0.1.2"; sha256="0i2x4dmqsqzfzavw2nrkfihr1pih9vqgcvkii27d81346drg7ys6"; depends=[RCurl rjson]; }; + blocksdesign = derive2 { name="blocksdesign"; version="2.0"; sha256="0d99dp7wci89gc2iacq830ibvfx0qa90ds9l7h2zwr4knam4brzz"; depends=[crossdes]; }; + blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; + blsAPI = derive2 { name="blsAPI"; version="0.1.3"; sha256="10jkfrl4xa3vzvh5rk3jdn5ix3hhqgbdg6h0wcijmgqhj8v9gj0j"; depends=[RCurl rjson]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; - bmeta = derive2 { name="bmeta"; version="0.1.1"; sha256="1krgv543kkpiajz3vy2vnlmsncgn7l3xkbfxrhh6p51k52w3a87d"; depends=[forestplot R2jags]; }; + bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; }; bnclassify = derive2 { name="bnclassify"; version="0.3.2"; sha256="0nbbna2qr57xvc7paqxaahff0r6gk92hz3gyk8v5kdb3hpcw8ph6"; depends=[assertthat entropy graph matrixStats RBGL rpart]; }; bnlearn = derive2 { name="bnlearn"; version="3.9"; sha256="19c3qda4lkzasgrjra0y3w8bg3jf9cp4lgaal7p43nlfani8y2xw"; depends=[]; }; + bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.4"; sha256="0rbv8vq7wlzc1mmjqaw9yxjfdgb0cwiwvhwlay24njq16fhidk9w"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; bnstruct = derive2 { name="bnstruct"; version="1.0"; sha256="1bc4q5gk56xmmsiglg8434hpl3lvbyg9hgv5xx5b8law6hn5znz4"; depends=[bitops igraph Matrix]; }; @@ -3033,52 +3170,53 @@ in with self; { bold = derive2 { name="bold"; version="0.3.0"; sha256="11b5zqyhvg3cc47mk8r7h219abj12paxcdb23gxqgkyrhlykkbks"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; }; boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; }; boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; + boostmtree = derive2 { name="boostmtree"; version="1.0.0"; sha256="1fkr7r1y7hsd1iv2qshy13p2kqy9hl08q66vfb96ma3ipf7cnw1n"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; - boot = derive2 { name="boot"; version="1.3-17"; sha256="1lxjj0sbm9v21f34srrwkniiwbc59ibjh99yry9756ic55h6jyl5"; depends=[]; }; + boot = derive2 { name="boot"; version="1.3-18"; sha256="0pi348vvgzn1ny54yxhw6kq6nl7rx9bpr9ji1a6wqs8ah5zj7z8j"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; bootLR = derive2 { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; }; bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; - bootnet = derive2 { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[corpcor dplyr ggplot2 gtools IsingFit qgraph]; }; + bootnet = derive2 { name="bootnet"; version="0.2"; sha256="1ij4hjgp4nnc6x0l38xvkv5i06r7rdddrfjhjsaipkdkrxdjki9z"; depends=[abind corpcor dplyr ggplot2 gtools IsingFit IsingSampler Matrix mvtnorm qgraph]; }; bootruin = derive2 { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; bootsPLS = derive2 { name="bootsPLS"; version="1.0.3"; sha256="0jkpci97chbvlfkcbbj3gm2dnj5aiwfrh739kd4fa0zra4ac1adh"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive2 { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; boral = derive2 { name="boral"; version="0.9.1"; sha256="1ls6is60d7h4zg5dhbgksjznfsffgim2pn6zgcvln7l6zl5di52s"; depends=[coda fishMod MASS mvtnorm R2jags]; }; - boss = derive2 { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[geepack lme4 Matrix ncdf]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; - boxr = derive2 { name="boxr"; version="0.2.9"; sha256="1ig4ygh5wgf2gv7yswjp7bw931sxwbwkir26ip2cl2zmc7sq9mix"; depends=[assertthat digest dplyr httpuv httr jsonlite stringr]; }; + boxr = derive2 { name="boxr"; version="0.3.2"; sha256="0inwyvnx1846ng6b72y52ndx601ic4iw23ha499rj6ivrjm726ki"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; }; bpca = derive2 { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; }; - bpcp = derive2 { name="bpcp"; version="1.2.6"; sha256="0yn1d2sjl53b1c4g6b91v8j8d0rymcn25547zi4c7rafz4ips1gl"; depends=[]; }; + bpcp = derive2 { name="bpcp"; version="1.3.1"; sha256="136wwxgs0cq1wk48r3xvh7ga2w5qmswbnxw9vg756imdzm1w6lnr"; depends=[]; }; bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; }; - bqtl = derive2 { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; }; + bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; }; + braidrm = derive2 { name="braidrm"; version="0.71"; sha256="1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3"; depends=[]; }; brainGraph = derive2 { name="brainGraph"; version="0.55.0"; sha256="11swjhpnnb6a2bq0xa0ai9jgzv0c481hc92rq1vpg1wzrlzz12rc"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti plyr RGtk2 scales]; }; brainR = derive2 { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; }; brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; breakaway = derive2 { name="breakaway"; version="2.0"; sha256="0x4hrvx6nd0k2gv7xvi9z8pl3cr94glm9s6fcna7ml8ag19dqwny"; depends=[]; }; - breakpoint = derive2 { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[doParallel foreach ggplot2 MASS msm]; }; + breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; brewdata = derive2 { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; }; brglm = derive2 { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; - brms = derive2 { name="brms"; version="0.6.0"; sha256="14w85nk4ksi06mn69cn1rkzicpk1kzl1z75mkrwgbmp8gb4s9c10"; depends=[abind ggplot2 gridExtra loo rstan shinystan statmod]; }; - brnn = derive2 { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; }; - broman = derive2 { name="broman"; version="0.59-5"; sha256="0sl7ppdy0d3mnnp7vz98ingv9irv58xjazf3rx473qw811ybcjdn"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; + brms = derive2 { name="brms"; version="0.8.0"; sha256="04dvfvpq0pb30gpiz9mzr799sd2irlqv1v9f7fjmfj19gildyhj9"; depends=[abind coda ggplot2 gridExtra lme4 loo Matrix rstan shinystan statmod]; }; + brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; }; + broman = derive2 { name="broman"; version="0.62-1"; sha256="1hcwrzagm78gkllfz6jplwzirr082prsiykydfc90ai9m0in3wjk"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; broom = derive2 { name="broom"; version="0.4.0"; sha256="0k9sbb4c4ncgnrsdr9bcl8nr57xdygjhh19mm8c7ymnsr56xcvxp"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; - brotli = derive2 { name="brotli"; version="0.4"; sha256="1d23r0dy9v9qgigixri7dkmr3jwx4cqhnwb8f1nrc7kmlvag8aw3"; depends=[]; }; + brotli = derive2 { name="brotli"; version="0.6"; sha256="01v2y8mwzcw7sfaqbq26528fpwmpprbd7lnn3prs5rwm3d9mafaa"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.1.0"; sha256="17n11i2wq16jzs1lk3wwyzfgacbm692g99vlakdqnr2a1c1vpfah"; depends=[ape httr taxize]; }; bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; - bssn = derive2 { name="bssn"; version="0.6"; sha256="0ngxczmi5d83zi18s8qk67w5jhlly9jvgxy2xk0d306qda6pgqds"; depends=[sn]; }; - bst = derive2 { name="bst"; version="0.3-11"; sha256="1wzpymg92f4ymz6hdqsnrgrzypa3kvy7h1y0iym2ckyswpcv65xq"; depends=[doParallel foreach gbm rpart]; }; - bsts = derive2 { name="bsts"; version="0.6.2"; sha256="0m18yl9c12p19psx3iz7swlblgbkmyyvfls5g74gm8qbbhbxmdsk"; depends=[BH Boom BoomSpikeSlab xts zoo]; }; - btergm = derive2 { name="btergm"; version="1.6"; sha256="13wd137c33i5acj4k1fvwnnawkk2bdrnz1gr9083ipx25shxc4kk"; depends=[boot coda ergm igraph Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; }; + bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; + bst = derive2 { name="bst"; version="0.3-13"; sha256="1jpjwmwchhlqx2li26xh0n88647nnjz58vmjxsq0kp7jaigy0xbn"; depends=[doParallel foreach gbm rpart]; }; + bsts = derive2 { name="bsts"; version="0.6.3"; sha256="1psr14nv20h1hzki32wsgyp23lbimbrchfbfaj1biwnl5xhhmrjm"; depends=[BH Boom BoomSpikeSlab xts zoo]; }; + btergm = derive2 { name="btergm"; version="1.7.0"; sha256="1xip1cr8j9blq4xnkj05f7c4alhij1i1k48ywhqr0bq09pi4rylc"; depends=[boot coda ergm igraph Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; }; btf = derive2 { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; }; bujar = derive2 { name="bujar"; version="0.2-1"; sha256="0g6mj1x9zbxkn3kxwbs2ncjfsicicvyr92krz8yqrms042gbk9ji"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; @@ -3090,69 +3228,73 @@ in with self; { c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.1.0"; sha256="0gp3mmw1s57wg6rvh78261l4nwqg0zpr98q27v389fz2scab637d"; depends=[Rcpp RcppArmadillo]; }; - cOde = derive2 { name="cOde"; version="0.2"; sha256="0741ghg0cqxvgwgvrvsgi75qlkirnm8cjc6bw6xbmkg97scrs5ck"; depends=[]; }; + cOde = derive2 { name="cOde"; version="0.2.1"; sha256="1zbc4armnzjbf0n4a5vby4m2ls9xpf6dhllzm3f3d02cbywacijr"; depends=[]; }; cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; }; - ca = derive2 { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; }; + ca = derive2 { name="ca"; version="0.64"; sha256="09496pzm7cms8v38vbyspsd2kvff3s31xpqlq4mf04sjh0vdahjs"; depends=[]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; cairoDevice = derive2 { name="cairoDevice"; version="2.23"; sha256="0l83ssravr0jx6clvm8ppyh1hvyf8zkkl509hafphzfp29nkiamh"; depends=[]; }; - calACS = derive2 { name="calACS"; version="1.2"; sha256="0h3jjs1gvh54c5lrkgmsiq7jnhhyw6hprs4jr5h4b41azr1fyj1d"; depends=[]; }; + calACS = derive2 { name="calACS"; version="2.2.1"; sha256="16vzkvcdx0ppf6q03j93g4lgzn3an9dcpj9c5d8k3z9dspvim5vq"; depends=[]; }; + calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; }; calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; }; camtrapR = derive2 { name="camtrapR"; version="0.98.0"; sha256="08hx3h4348hw3y230371pgvlw3q77srhang3mhlim7b48s38dmbf"; depends=[overlap rgdal secr sp]; }; - cancerTiming = derive2 { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[gplots LearnBayes]; }; + cancerTiming = derive2 { name="cancerTiming"; version="3.1.5"; sha256="1hs93brw5cnk2fk114aqvdcf020wq6dmnhcirw93y4xm79bqyjx5"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; }; cape = derive2 { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; }; caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; - capm = derive2 { name="capm"; version="0.9.0"; sha256="1mhqq4wid00n6bw8795x69g561d3a3sqw6g8pkmgrxmyrb1z30yr"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; + capm = derive2 { name="capm"; version="0.9.1"; sha256="1njfw4pl6hmapdspvwabn7db2c4nqf3ja4rlv1lmpaakinzhivj2"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; }; - captr = derive2 { name="captr"; version="0.1.3"; sha256="1i0szfqzh2yrdf9kh9fcpr9cr5zfs5khs8sklg7650dm0jf8w383"; depends=[curl jsonlite]; }; + captr = derive2 { name="captr"; version="0.1.5"; sha256="1z3l3wgvxylnjsybnvcl7aphkp60xpx43xs0n9nnan07fcb2n7bd"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1"; sha256="00rbsir00ibxa9r6b17sa1jryjxjjygzsan08pl9wa65r0gxzrkm"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; - car = derive2 { name="car"; version="2.1-1"; sha256="1wzgy2pcylhvgrlly8v3gi29gc3gimrhmjvhrr93b1cy0wwjj0wx"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; - carcass = derive2 { name="carcass"; version="1.5"; sha256="0qlvm8vrv7zq76y9fbgx6dcc2ni033jrdv38lywpqfzhz1m1b3v8"; depends=[arm expm lme4 MASS survival]; }; + car = derive2 { name="car"; version="2.1-1"; sha256="1wzgy2pcylhvgrlly8v3gi29gc3gimrhmjvhrr93b1cy0wwjj0wx"; depends=[MASS mgcv nnet quantreg]; }; + carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; }; - cardioModel = derive2 { name="cardioModel"; version="1.2"; sha256="1fn56js9d1px9g0lvgcr5xlyzwiavj030dw90m8p02v4mb6f47a0"; depends=[nlme plyr]; }; + cardioModel = derive2 { name="cardioModel"; version="1.3"; sha256="1r52pjywp2x5mm2hg296q893djkhlzh8d7vq9pg76qdpi0m9ralg"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; }; - caret = derive2 { name="caret"; version="6.0-62"; sha256="09pdl4hrv1k39b888civymvdnx0c0n4yxfj1lnyd8qmy53z9q2zc"; depends=[car foreach ggplot2 lattice nlme plyr reshape2]; }; - caretEnsemble = derive2 { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools digest ggplot2 gridExtra lattice pbapply plyr]; }; + caret = derive2 { name="caret"; version="6.0-64"; sha256="1pgbqzivks6vpaw2pq72yv81a98dm264hmj2vnk4vhyvdi91ihq9"; depends=[car foreach ggplot2 lattice nlme plyr reshape2]; }; + caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; - cartography = derive2 { name="cartography"; version="1.1"; sha256="18kbl5kdy2b4xlx82ydlahn0mvg177vxcdp3pp1s4k17sia0izd6"; depends=[classInt sp]; }; + cartography = derive2 { name="cartography"; version="1.2"; sha256="03p95vx3qhcf8kkb265229ki1njmhw3d56hypm9gq9wpnvk4gw6b"; depends=[classInt sp]; }; + carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; }; - caseMatch = derive2 { name="caseMatch"; version="1.0.1"; sha256="0r8z0dfhaqc5wmcrd1mgq1bn71h41fhk5q3ihffg0s9qsix4pk7j"; depends=[]; }; + caseMatch = derive2 { name="caseMatch"; version="1.0.6"; sha256="0ak5q7pijmq359sm2vy5rr1szxv0kzg6ydka3ny24vsx2lx3fdrs"; depends=[]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.6"; sha256="1a5wfi944x0a8bgknlgrdxqj5h2zz15lq8k0iavd1k8bifir3pdi"; depends=[]; }; + catdap = derive2 { name="catdap"; version="1.2.2"; sha256="02rz5wqbbvh73gjfh4bg31qcpfa48b4bm3h1i19r3siajvqaxkkb"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; }; catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; }; - cati = derive2 { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; }; + cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; }; catnet = derive2 { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; - causaleffect = derive2 { name="causaleffect"; version="1.2.0"; sha256="0dw2660g958ni086jhqr084hxfsf7rnv30qyx56vi8l5qbapsxaw"; depends=[ggm igraph XML]; }; + causaleffect = derive2 { name="causaleffect"; version="1.2.4"; sha256="10hn2wy47n4j7d43bvzj1rdi8fjrg2p3czcf50631smg8a2rarf0"; depends=[ggm igraph XML]; }; causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; }; cba = derive2 { name="cba"; version="0.2-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; }; + cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; - ccaPP = derive2 { name="ccaPP"; version="0.3.1"; sha256="0f1wykvch1jyxgrl5lqbyj3gwrriwqp5ixny0g5x0mk5c0rhmfqc"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; + ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; }; cccp = derive2 { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; }; cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; }; ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; }; ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; - cchs = derive2 { name="cchs"; version="0.1.0"; sha256="1x6pzwjdcklkbgr1yalijrcj3g56hj6085fh4pzqbm7xkqcj1mi6"; depends=[survival]; }; + cchs = derive2 { name="cchs"; version="0.2.0"; sha256="15bihlpw2q7mcna9200hlzvvbbyr3rrc0xbxyjca1n9dbgsqpibp"; depends=[survival]; }; cclust = derive2 { name="cclust"; version="0.6-20"; sha256="1davlnrikfriczdwlprqd46axs9acvz30hhni134cisy11snlq7s"; depends=[]; }; cda = derive2 { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric plyr randtoolbox Rcpp RcppArmadillo reshape2 statmod]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.4.0"; sha256="1b0l6vqhks9mqpx3c94qip3dd8031rl4jjqjnmdpcvmfhg335yjf"; depends=[dplyr httr pbapply xml2]; }; cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; - cdfquantreg = derive2 { name="cdfquantreg"; version="1.0.0"; sha256="099gz81s7cdmvlvvgwbmmqq5nynh24azm754cvb81ap6d9si34pa"; depends=[Formula MASS pracma]; }; - cds = derive2 { name="cds"; version="1.0.2"; sha256="03ypqdqja5jqfzxgqafaxbnznazjaw5jv87yd6sw915djbffna45"; depends=[clue colorspace copula limSolve MASS]; }; + cdfquantreg = derive2 { name="cdfquantreg"; version="1.0.3"; sha256="1czb9v2naxzxfyga2npfljlgx15k1mspqksn6jql5faksbgfqb0v"; depends=[Formula MASS pracma]; }; + cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; celestial = derive2 { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; }; @@ -3162,12 +3304,12 @@ in with self; { cems = derive2 { name="cems"; version="0.4"; sha256="0mk02m702xfr1gh0l3973z1hdpncgjl2vfd1k1iss5s64k56gs4q"; depends=[plotrix rgl vegan]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[glmmML maxLik miscTools sandwich]; }; + censorcopula = derive2 { name="censorcopula"; version="1.0"; sha256="1y2vh6k6v5j5k3w4mk4mglv92103bz1mihf41jd55ky39dyr0gmr"; depends=[copula]; }; censusr = derive2 { name="censusr"; version="0.0.2"; sha256="1x2s0q0d30hsb5sqdgvlz8anv5vcsm0ld9p96jzsin6lfsgbb1dm"; depends=[dplyr httr]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; - cepp = derive2 { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[randtoolbox trust]; }; + cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; - cffdrs = derive2 { name="cffdrs"; version="1.7"; sha256="11s6cxihrvj9ajvsk1wka8ivlq9faazgwry2f3sngx33d8fb8zna"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; - cg = derive2 { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc lattice MASS multcomp nlme survival VGAM]; }; + cffdrs = derive2 { name="cffdrs"; version="1.7.3"; sha256="1v2iwphw468lpw2im50vf2h762sq8fj84fakqr96zb7im9890zw1"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; cgam = derive2 { name="cgam"; version="1.3"; sha256="0lyhgiwskvcbbzd6y9ryndk4m3hjcwhd2ysnlhx7vkazp8936y87"; depends=[coneproj]; }; cgdsr = derive2 { name="cgdsr"; version="1.2.5"; sha256="1w5nd4hirlw8s9a8ysr6102pq9sbz4820qni06g98ykyg7yb32hx"; depends=[R_methodsS3 R_oo]; }; @@ -3176,38 +3318,37 @@ in with self; { cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; }; cghseg = derive2 { name="cghseg"; version="1.0.2-1"; sha256="0q9ks19r21b6p0gfd7mnsgp7pbihz3yzmbzijlrx178f1z9yjx5q"; depends=[]; }; cgwtools = derive2 { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; }; - changepoint = derive2 { name="changepoint"; version="2.2"; sha256="16552y79dll9ckp630v8a0cpa26hx42mh3zhi242ssdsiflp8xnr"; depends=[zoo]; }; + changepoint = derive2 { name="changepoint"; version="2.2.1"; sha256="1ifqv2qv8lwsfwia14dn53hs29xc027ap397l2wpmmmrzx0v6vrf"; depends=[zoo]; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; }; - checkmate = derive2 { name="checkmate"; version="1.6.3"; sha256="1s13d3sfpqa4wzj3lf74dchs6zrzvbdhs1kpf8pz32pwkjicmj5y"; depends=[]; }; + checkmate = derive2 { name="checkmate"; version="1.7.3"; sha256="11xwdvpi6i9cm3fp44fgish0vxpb6jqbcd24hmppm39ixf28ajg2"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="0.3.15"; sha256="1mzf5d2mxwc7l9149a0sbxamxnmq4xc1ia8n5sd412sv5gmzxw89"; depends=[]; }; cheddar = derive2 { name="cheddar"; version="0.1-630"; sha256="15hx9pm4pwmzwb82qgbf4ryy7zbsv64zw4qm6v7xkkaw27rjl4vg"; depends=[]; }; chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; }; chemometrics = derive2 { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; - chemosensors = derive2 { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[ggplot2 LearnBayes pls plyr quadprog RColorBrewer reshape2]; }; cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; }; childsds = derive2 { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; }; - chillR = derive2 { name="chillR"; version="0.55"; sha256="1b8lp4dfr3366ism7q2pddqpps3zmsyv5xg9rpyyh9yyl9ga1xhy"; depends=[fields Kendall pls]; }; + chillR = derive2 { name="chillR"; version="0.62"; sha256="0fj7kymwdhi4svqarkljln01d78bspflh910s53r2sj78l9sv53g"; depends=[fields httr Kendall pls readxl sp XML]; }; chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chngpt = derive2 { name="chngpt"; version="2015.9-5"; sha256="0yqapf9fq0arh1hgwd5lklp6fklia926n0h1980731hqxd362bpq"; depends=[kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; - chopthin = derive2 { name="chopthin"; version="0.2"; sha256="0jdflkd6g30gn9x9jbap47l7rh5mmvfswwb8hiivnsb1yl07xhzl"; depends=[Rcpp]; }; + chopthin = derive2 { name="chopthin"; version="0.2.1"; sha256="0sib3ic79hff5w2xmmw4z9c6bax33jczrcijs7ywdb8y3viwy5av"; depends=[Rcpp]; }; chords = derive2 { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; }; - choroplethr = derive2 { name="choroplethr"; version="3.4.0"; sha256="0dx696a14806if3pyk028vsip8ivwczj0s5gya2s114hmyz7i989"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; }; + choroplethr = derive2 { name="choroplethr"; version="3.5.0"; sha256="0askw7flbh3yd6ycmymzqxxgad7hzlp294dw7dijxyv0z5051d2y"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; }; choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.0"; sha256="0xfqw7spjali13sdq0jp3p62fgzvfm2ixbbcay8iwjm5plh5p5sw"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; chron = derive2 { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; }; - chunked = derive2 { name="chunked"; version="0.1.1"; sha256="021i06bhmn2b4s5d349bg3jpyb560cvlpg8g3mgpixv8841rf7lf"; depends=[dplyr LaF lazyeval]; }; + chunked = derive2 { name="chunked"; version="0.2.0"; sha256="13fi56dpvvf1shchvyank31xmb8wh9rszb74p2bfh3b5shwygx97"; depends=[dplyr LaF lazyeval]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; circlize = derive2 { name="circlize"; version="0.3.4"; sha256="02d2di0v6cqmp5rszrmynrnyg00p6wd7d000ghbwsjw2679ysr13"; depends=[colorspace GlobalOptions shape]; }; circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; - cit = derive2 { name="cit"; version="1.7"; sha256="1yklcrznv0mf3v5f0gf6nw1i8rx4wzvj0h4m8xahcrslf4nm2p7s"; depends=[]; }; + cit = derive2 { name="cit"; version="2.0"; sha256="16i3riv5fnaih240hkr8q9zpgxjr26abv9mg6spi6cs95ny2rybs"; depends=[]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; - cjoint = derive2 { name="cjoint"; version="2.0.1"; sha256="0b6z7wmwif7p8rllpmzcg4d5hlba03x2k378pa8gycyrpdwrdxsf"; depends=[ggplot2 lmtest sandwich survey]; }; + cjoint = derive2 { name="cjoint"; version="2.0.4"; sha256="0c2vs5zbw83r7jlm6kwjylyd5yjnyz5qaqnk0lh9x54jd0f3nqwv"; depends=[ggplot2 lmtest sandwich survey]; }; ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; }; @@ -3219,10 +3360,10 @@ in with self; { classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; }; classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; }; cleangeo = derive2 { name="cleangeo"; version="0.1-1"; sha256="1bahj4lf7fvf8qlbl7g2jh9a4vqr62llg43yklm380fky23n04r1"; depends=[maptools rgeos sp]; }; - clere = derive2 { name="clere"; version="1.1.2"; sha256="1my9fw369dlnxk59lhdiafyihkdrm6f5gi301vjsgw1kwyxf11xk"; depends=[Rcpp RcppEigen]; }; + clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; clhs = derive2 { name="clhs"; version="0.5-5"; sha256="0p1w5sb27qk609azywzz17c4f2cgdkrl88gckgrd3lg1cfa9vl7d"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; - clickstream = derive2 { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv43z33zrbmc1j0d0wz52kk7z4czxmljqs3qs6syfn2"; depends=[arules data_table igraph linprog plyr Rsolnp]; }; - clifro = derive2 { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; }; + clickstream = derive2 { name="clickstream"; version="1.1.7"; sha256="0j87209pir852djga5dr1rdj6i554v4bpvhkk1i843lkfsfz4v12"; depends=[arules data_table igraph linprog plyr Rsolnp]; }; + clifro = derive2 { name="clifro"; version="2.4-1"; sha256="0yi8kgw4l2pxaa340avwfswfjsngdkfp3kv4cnnw9gr7y57pjaz1"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climtrends = derive2 { name="climtrends"; version="1.0.5"; sha256="0pgdx0hhrqpnj3qf37ms7z9fhy4vvgichrpi4vvmin5xksmaczxa"; depends=[]; }; @@ -3236,11 +3377,12 @@ in with self; { clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; clpAPI = derive2 { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; - clttools = derive2 { name="clttools"; version="1.2"; sha256="0zhflnd98y1mf9kc3mbmkl5bxcg0hlmqsmrrr8spq6c0qn7zivdl"; depends=[]; }; - clue = derive2 { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; }; + clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; + clue = derive2 { name="clue"; version="0.3-51"; sha256="1lhjd27lmwfsb7ffnbybv3yvw2mfca3hm03nb6mkk3alh2ncam2g"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; }; clusrank = derive2 { name="clusrank"; version="0.1-1"; sha256="0p14lflhg3kjrdsyva2gnx5frs0fpnsn3fnda49paf29ynm3x7w4"; depends=[]; }; clustMD = derive2 { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; }; + clustMixType = derive2 { name="clustMixType"; version="0.1-16"; sha256="1p3i83wrbgs1qpirmmckmpnbbs3p73dl7mh8f724qll761phm8v5"; depends=[]; }; cluster = derive2 { name="cluster"; version="2.0.3"; sha256="03jfczb3dwg57f164pya0b762xgyswyb9a7s33lw9i0s5dq72ri8"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.6"; sha256="1jy2xxh9i4dsdiqmkl35xpdmq6vyf3alh4d0npzgrwmjl7516pd3"; depends=[]; }; @@ -3259,31 +3401,36 @@ in with self; { clustvarsel = derive2 { name="clustvarsel"; version="2.2"; sha256="1b38y9zn4xbiddm5m5ki307i5yih2nadhnpnsizz91jkcqdnjhw1"; depends=[BMA foreach iterators mclust]; }; clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; + cmaesr = derive2 { name="cmaesr"; version="1.0.1"; sha256="1apka7891agpz2v3smv7m5sa09myjrxq3w3jzj28j2fn4cgfxn47"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; cmm = derive2 { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; }; + cmna = derive2 { name="cmna"; version="0.1.2"; sha256="0iqr4fxjhi243ccb2kbs75pgxr66zlbp5005d5qsvzyn0qxnaa62"; depends=[]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; + cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; }; cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; }; - cmsaf = derive2 { name="cmsaf"; version="1.5"; sha256="06gmdxiss71qn3gaw4cs3wp0mizyny1ln3ymjlnp6kh3v9vzkjkw"; depends=[fields ncdf4 raster sp]; }; + cmsaf = derive2 { name="cmsaf"; version="1.6.1"; sha256="0wsl37i7vwfh1mqrll4ff7qr8wc0mr5f8m6w4r41qihda1bs4y0c"; depends=[fields ncdf4 raster sp]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; }; cna = derive2 { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.0-0"; sha256="0kbq01qrmpn133v18rjphhznpnj8g6dcn1lrbsjykhxkqz086s36"; depends=[lsei]; }; - coala = derive2 { name="coala"; version="0.3.0"; sha256="1dg0ycaw81v52p0skm4nx5n5la8icic4pbf70i9c0azvj40x60h8"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; }; + coala = derive2 { name="coala"; version="0.4.0"; sha256="1ssh0fg4h6v4p4f9184qpwbn8830b9mlvjq73aq67my46sx7i2jh"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; - coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; + coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; }; cobs = derive2 { name="cobs"; version="1.3-1"; sha256="18dfc767zfipp4h4q7lgk5yp1c63lb9myc6bg3jkzr1v1xwbhwqk"; depends=[quantreg SparseM]; }; cocor = derive2 { name="cocor"; version="1.1-2"; sha256="0lkj4rjny2sv4sbvrh159zw66h99rkl1zvncb3g8f17zizmvvfsm"; depends=[]; }; - cocorresp = derive2 { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; }; - cocron = derive2 { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; }; + cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; }; + cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.18-1"; sha256="03sc780734zj2kqcm8lkyvf76fql0jbfhkblpn8l58zmb6cqi958"; depends=[lattice]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive2 { name="codep"; version="0.5-1"; sha256="1ral0f2yb7fa5j216r4hlssijim26q4mr2kdfllf4xn66pssf32y"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-14"; sha256="0y9r4m2b8xgavr89sc179knzwpz54xljbc1dinpq2q07i4xn0397"; depends=[]; }; - codyn = derive2 { name="codyn"; version="1.0.0"; sha256="12pl6x296mpaidssigfiwjxi747k40qlhgj6wbzs82sv39r39zlr"; depends=[assertthat]; }; + codingMatrices = derive2 { name="codingMatrices"; version="0.2.0"; sha256="0gysa26nzrcf9zhlc2vb2banh3yhv53hdbx1an9rjb3rd3n7xh4y"; depends=[fractional Matrix]; }; + codyn = derive2 { name="codyn"; version="1.0.1"; sha256="1r3plblrpdsfx9ng468zjr6imhra5x2xxqivrnw3nmnfiipmik68"; depends=[assertthat]; }; coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; }; - coefplot = derive2 { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr proto reshape2 scales useful]; }; - coenocliner = derive2 { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; }; + coefplot = derive2 { name="coefplot"; version="1.2.4"; sha256="0phpz4fvvxvpaybp4q1s69qxcpdzj8qxambivncps101mz7jj3sq"; depends=[ggplot2 plyr reshape2 useful]; }; + coenocliner = derive2 { name="coenocliner"; version="0.2-1"; sha256="0y756x8c4psv972wgi6alfn5sd5zybkp2pf68kglcn6w9xd62b0k"; depends=[]; }; + coenoflex = derive2 { name="coenoflex"; version="2.1-0"; sha256="0gh4pr5h3kp5v7bx1gif0j4wj98aqs1wm4mcmv7z7q66c007q50m"; depends=[mgcv]; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; - cofeatureR = derive2 { name="cofeatureR"; version="1.0.0"; sha256="0z9xg8mv1a6vb2b3v4kqlvb3ax2vn28qdmnz5wbraclavhvijdj6"; depends=[dplyr ggplot2 lazyeval]; }; + cofeatureR = derive2 { name="cofeatureR"; version="1.0.1"; sha256="1nxdi97b37pw5xr6cib8hjgziazmy9lfbjgixn9ayacvdhkjs7ib"; depends=[dplyr ggplot2 lazyeval]; }; coin = derive2 { name="coin"; version="1.1-2"; sha256="0wwkw0sslfp8ass83rh2d9qhzz2p69gv0c6wi778nanjvaj533x5"; depends=[modeltools multcomp mvtnorm survival]; }; cold = derive2 { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; }; coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; }; @@ -3291,7 +3438,7 @@ in with self; { coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.0"; sha256="1hxh09sg9mdbfz4vx2z9wyx9xs5a82l8sw1wbwaa717a6q3ayjyj"; depends=[]; }; - colorscience = derive2 { name="colorscience"; version="1.0.1"; sha256="0085cxdknfm70i0x57jb9fpaqhpgcvl150n2mcaw8wgw1lf59f06"; depends=[Hmisc munsellinterpol pracma sp]; }; + colorscience = derive2 { name="colorscience"; version="1.0.2"; sha256="0d4bn1s7jmywh528nm3fpra3557v6nxr594q42phw2nq58gscf3z"; depends=[Hmisc munsellinterpol pracma sp]; }; colorspace = derive2 { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; }; colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive2 { name="colourlovers"; version="0.2.0"; sha256="17macf5nby286n80pfsha54r3q3idpfhkm2w1c8hbsh2rxfh6r1d"; depends=[jsonlite png XML]; }; @@ -3299,14 +3446,16 @@ in with self; { combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.3"; sha256="08ck1cv5apzn379j6mm2gmhm4qj18418crmqbbp46d80waf0ghxq"; depends=[dplyr]; }; + comf = derive2 { name="comf"; version="0.1.1"; sha256="0ynqyfzj9nnslyi5h4mciyrk8mlf0zg1j9z6liqjld4f2c1zm0al"; depends=[]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; - commentr = derive2 { name="commentr"; version="1.0.1"; sha256="00p2v2kn3j6m34rr8ff7bb54ixz6zghv8h5c0yw5idi9x16rsj04"; depends=[stringr]; }; - commonmark = derive2 { name="commonmark"; version="0.6"; sha256="0hdcfiq1w24rljj3lxykmc41anymv5iwrb8xfand76kpyjwkqqnc"; depends=[]; }; + commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; + commonmark = derive2 { name="commonmark"; version="0.7"; sha256="11a6v8dsrhb2c5ydy6qsvdhn9vwjm4q8y9wjmbp6sc6zngfqqk6a"; depends=[]; }; compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareGroups = derive2 { name="compareGroups"; version="3.1"; sha256="1cdvcpjcbxfzc06j3v8pvd0nd89r7ljss749vbwwns7kjxqkpbfn"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xlsx xtable]; }; + compareDF = derive2 { name="compareDF"; version="1.0.0"; sha256="1dxqj3zd8a7261q1692sj11gxnizd82wgc24j73b94xkfk0iiv74"; depends=[dplyr tidyr]; }; + compareGroups = derive2 { name="compareGroups"; version="3.2"; sha256="0p4xaxjxyld5a0i0z1bzrbqz9zzlk0pz0qy0pkpfcq4czpyfv4sz"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; }; @@ -3317,21 +3466,24 @@ in with self; { compound_Cox = derive2 { name="compound.Cox"; version="2.0"; sha256="1mid09h3xp7p33g371gbghr665qnny1rvi20ha8rv04d928l2r7a"; depends=[numDeriv survival]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; + concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; concreg = derive2 { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; }; cond = derive2 { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; + condformat = derive2 { name="condformat"; version="0.2.0"; sha256="07d79l0m6cbvxrj0p8fi8v7blpapanl7hzhkvg4npyz2xjvy6bjk"; depends=[assertthat dplyr htmlTable knitr lazyeval scales]; }; condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; + condvis = derive2 { name="condvis"; version="0.2-1"; sha256="1gbfzgim9dp79244m2550slgd365aafmcy75klh4z32s6dl4rnvd"; depends=[MASS]; }; coneproj = derive2 { name="coneproj"; version="1.9"; sha256="17qwix8k7agbxs8g4psyivlr4w4k8v2w0qfhs8a4vsg28z88kr6d"; depends=[Rcpp RcppArmadillo]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; }; - conformal = derive2 { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret e1071 ggplot2 randomForest]; }; + conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; }; confreq = derive2 { name="confreq"; version="1.4"; sha256="0cbhisw3yhg71081a2f40jgbdjcvx36xrrnbhwcyhxd43qn2dp0q"; depends=[gmp]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; connect3 = derive2 { name="connect3"; version="0.1.0"; sha256="07ih875ynrxzynj989d0h469ilq6c634z2z3igvxpkx40wr451d5"; depends=[]; }; - conover_test = derive2 { name="conover.test"; version="1.1.0"; sha256="0jg8bcqf3zbzabj5dr76js8hwkgp80428sx2rm8bxapgkcwaqz1k"; depends=[]; }; + conover_test = derive2 { name="conover.test"; version="1.1.1"; sha256="0dvxrm1hqzlkzhmp3p6qackjpwwvl812h63skwqiwh70sc7xifd0"; depends=[]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; contfrac = derive2 { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; }; conting = derive2 { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[BMS coda gtools mvtnorm tseries]; }; @@ -3340,16 +3492,17 @@ in with self; { controlTest = derive2 { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; }; convevol = derive2 { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; }; convoSPAT = derive2 { name="convoSPAT"; version="1.0"; sha256="0awax173csyj705nh48nfk1f4w00yjkm00xfglkphccpny1bkqyq"; depends=[ellipse fields geoR MASS plotrix StatMatch]; }; - cooccur = derive2 { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[ggplot2 gmp reshape2]; }; + cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; }; + coop = derive2 { name="coop"; version="0.3-0"; sha256="0mcxfhik6dd8knlnf9m34gf9ili6i3n9wq752dy66mx1z59kcvl6"; depends=[]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; copBasic = derive2 { name="copBasic"; version="2.0.1"; sha256="1jmjyz70hw8sbihxf74ir6sxrlcxwv0c1fhw1ph0raasbyxrxml6"; depends=[lmomco]; }; copCAR = derive2 { name="copCAR"; version="1.0-1"; sha256="173jv69n4g68yfrz03sg23qzlyvvlw988axgj5knq3l2cq6pjpb2"; depends=[numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[fields maps MASS mvtnorm]; }; copula = derive2 { name="copula"; version="0.999-14"; sha256="08mas18knyz3laxrg9hx9i6rwhmksyi43wni2ydlrlp2cflq4ipz"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm pspline stabledist]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; }; - corHMM = derive2 { name="corHMM"; version="1.17"; sha256="02rqqwxjyyfjf3dr8825rp9glylls6p3w5bdcg825m1ri0jr5s7z"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; }; + corHMM = derive2 { name="corHMM"; version="1.18"; sha256="1x1hrhb10rln4jhx03gx5ap1qbdk2xcknlnr3xmb6aawqsx0h4cq"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; - corclass = derive2 { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; }; + corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; }; corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[plotrix rJava XML]; }; @@ -3373,10 +3526,11 @@ in with self; { covLCA = derive2 { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; }; covRobust = derive2 { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; covTest = derive2 { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; }; + covafillr = derive2 { name="covafillr"; version="0.2.1"; sha256="1mn7jnhimp1bspsl8rq8br8z4r2nb7izbvykbzz5zpmgg2204pl5"; depends=[RcppEigen]; }; covmat = derive2 { name="covmat"; version="1.0"; sha256="00y966897x83v471yarfikpr794b7adhgn5c9hgh0j1j4yfdc3b8"; depends=[DEoptim doParallel fGarch foreach ggplot2 gridExtra lhs Matrix mvtnorm optimx reshape2 RMTstat robust robustbase scales VIM xts zoo]; }; covr = derive2 { name="covr"; version="1.2.0"; sha256="1gavcqqbg211sv52sicrh87vif71dl6n9xfcb6b3giqw897w7vrc"; depends=[crayon devtools htmltools httr jsonlite rex]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; - cowplot = derive2 { name="cowplot"; version="0.6.0"; sha256="1d3a6qbwiqwbnd6qhcxmryckhz33c40qnjl5mp5w065ba3p5gj4k"; depends=[ggplot2 gtable plyr]; }; + cowplot = derive2 { name="cowplot"; version="0.6.1"; sha256="1lfqs19l0xs87lnm06f8cy1vkl8hhmwp1g6zl9k1ar60h7kg0y4l"; depends=[ggplot2 gtable plyr]; }; cowsay = derive2 { name="cowsay"; version="0.4.0"; sha256="0lbamjvngj1s0jv8ybbfddx52yqf3h7zkjixl9qr0ha8xkidg7r3"; depends=[fortunes]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; coxme = derive2 { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; }; @@ -3384,7 +3538,7 @@ in with self; { coxphw = derive2 { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; - cp4p = derive2 { name="cp4p"; version="0.3.3"; sha256="06ydx5i5fzalc75mimhla60hxvswk4ayp7fikiirlhricfh02i03"; depends=[limma MESS multtest qvalue]; }; + cp4p = derive2 { name="cp4p"; version="0.3.4"; sha256="03g4fn7ih6nmi9xsn7b10ljfdmcv8svyiwcpd5l3yzl3ylbwf2gh"; depends=[limma MESS multtest qvalue]; }; cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; }; @@ -3396,19 +3550,20 @@ in with self; { cquad = derive2 { name="cquad"; version="1.3"; sha256="1r6g3yp3vvm8d5351lan4im1bmir38d4l9cf8bw0ay7as33ny3x9"; depends=[MASS plm]; }; crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; }; cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; + crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.3"; sha256="0yz16ilmy0cilsb9f61bs3y48xi614i4l5qw6fh8hinsqnhzyv0l"; depends=[]; }; crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; - crawl = derive2 { name="crawl"; version="1.5"; sha256="19iqikq5japqpzy82lmswivfi7swap5g5rdpl9ixw7kbgjaxh535"; depends=[mvtnorm raster sp]; }; + crawl = derive2 { name="crawl"; version="2.0"; sha256="1brk2xpa623x58rf98bkyq1fqz0mqavg55pj2xifs481iz70w294"; depends=[mvtnorm Rcpp RcppArmadillo shiny]; }; crayon = derive2 { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; }; crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; - crch = derive2 { name="crch"; version="0.9-1"; sha256="0lzarmz8f2rw5q28kfsbdzg037iskgxayyhgq9dnrpbyz1726clp"; depends=[Formula ordinal]; }; + crch = derive2 { name="crch"; version="0.9-2"; sha256="0i3gli7l4p4xmwq7xzalpq2l140wj36wbggwh3k3jbn0avxpbi56"; depends=[Formula ordinal]; }; creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; cricketr = derive2 { name="cricketr"; version="0.0.12"; sha256="0v6g3kkf9a8qvmfis1xdhja5j1impmi6mm5dmlq04s8qj4khnnqi"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; - crmPack = derive2 { name="crmPack"; version="0.1.6"; sha256="0li26q1sknvjy6an863pas5lrxjq8zmlf83mvasyiwz6v2g0r044"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; + crmPack = derive2 { name="crmPack"; version="0.1.9"; sha256="0kr2vqmi4bk5dmbi44xvg3rqnfmhj69qcqwbll0qqxd5x36jpkbq"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; @@ -3423,8 +3578,8 @@ in with self; { crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive2 { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; }; crskdiag = derive2 { name="crskdiag"; version="1.0"; sha256="18qx8i069c7xck7rfgfkrnw409ikv1jx375vlq7vqp61qx91lqic"; depends=[cmprsk]; }; - crunch = derive2 { name="crunch"; version="1.7.3"; sha256="1pasbah54a97944ih1229rw28q4sdd92g9ccrzi0fxpmgzy8i9xa"; depends=[curl httr jsonlite]; }; - cruts = derive2 { name="cruts"; version="0.1"; sha256="0p2iiccjf1414g5xp6rcww58vimh2ahj0ghak1mrjyvgb4q6zgh3"; depends=[lubridate ncdf raster sp stringr]; }; + crunch = derive2 { name="crunch"; version="1.8.0"; sha256="0z0035bv70b13xjxbqa97bpjkr44dw7k3fca96xhjkwn83vjm62f"; depends=[curl digest httr jsonlite]; }; + cruts = derive2 { name="cruts"; version="0.2"; sha256="1qxhkikym2f775zf4zg0pd960lcdd183fpnmd7afm75lm2xpzccv"; depends=[lubridate ncdf4 raster sp stringr]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.5-1"; sha256="1mdg0yjp3jplj2jr5kqs2n4j9l2419n5xp3xnjv8kc8a8anc2asg"; depends=[maptools plyr sp]; }; @@ -3433,23 +3588,24 @@ in with self; { csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; }; - ctmcmove = derive2 { name="ctmcmove"; version="1.0"; sha256="01f0awlz1irb68laf11zr463aja1afdnn20fl8xrwda7qxmqqxam"; depends=[crawl Matrix raster]; }; - ctmm = derive2 { name="ctmm"; version="0.3.0"; sha256="0233s6m0173x1gcqhkwr7n1ylj07rj4y6ccj48iyhsy90vd49pps"; depends=[expm manipulate MASS Matrix numDeriv pbivnorm raster rgdal sp]; }; + ctmcmove = derive2 { name="ctmcmove"; version="1.2.1"; sha256="0hca63bsqk0jymmcpn6f76mp0s90jm9c03min40svlfriapqb5f4"; depends=[crawl Matrix raster]; }; + ctmm = derive2 { name="ctmm"; version="0.3.1"; sha256="0y8mmc09q5gsanddwxivynwpvwa9hwafayqqk57xjh1xsnsdbxn5"; depends=[expm manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales sp]; }; cts = derive2 { name="cts"; version="1.0-20"; sha256="0bsf52b98fji85j01qv0krc7yzr8mqhvn7w1zsy2rbanjmlwmnca"; depends=[]; }; - ctsem = derive2 { name="ctsem"; version="1.1.5"; sha256="0h2m234azxhfycksp8v32i725ii83zpzwmanra4ndh0jfncvs8z2"; depends=[MASS Matrix OpenMx]; }; + ctsem = derive2 { name="ctsem"; version="1.1.5.2"; sha256="0rh4ikkkmzz2nrd62zbky6chxkx9hfdjr65iqp38b4pw0wdkvnvp"; depends=[MASS Matrix OpenMx]; }; ctv = derive2 { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; }; cubature = derive2 { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; }; - cubfits = derive2 { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; }; + cubfits = derive2 { name="cubfits"; version="0.1-2"; sha256="07phnpgag68ss08qyzhj2g1s084w0cc583a30i09c82ql9j3gbpk"; depends=[coda foreach]; }; cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; }; cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; }; cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; - curl = derive2 { name="curl"; version="0.9.4"; sha256="1ndwi1marw5n2x96lrm7lzibygsk2mav8p1wqhkxyyh9nrgvbfl6"; depends=[]; }; + curl = derive2 { name="curl"; version="0.9.6"; sha256="0zlpa7ilxdcf3754xgnsiipqsjv896wimgay4lk3ddadplrh76wc"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; - curvHDR = derive2 { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature flowCore geometry hdrcde ks misc3d ptinpoly rgl]; }; + curvHDR = derive2 { name="curvHDR"; version="1.1-0"; sha256="0cymz4i29sih9z5hkih86db41x39kzzm9vq1374rfxz26l2c00xy"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; curvetest = derive2 { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; }; cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; }; + customizedTraining = derive2 { name="customizedTraining"; version="1.0"; sha256="0ywyn5jqlhizvsa19xs89xs5bl1sbismjajdk78w1py1s97z9k8w"; depends=[FNN glmnet]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; @@ -3461,13 +3617,17 @@ in with self; { cwhmisc = derive2 { name="cwhmisc"; version="6.0"; sha256="13lgpxl957lbf333m1a17ad8iy3kjfrzav0sxx7w3vnsj98aqa43"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; - cycleRtools = derive2 { name="cycleRtools"; version="1.0.4"; sha256="0nkmsf2800m8w5d2cpyh2wfdz98n93l6chmp062gisdn884jd7j9"; depends=[Rcpp]; }; + cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; }; + cyclocomp = derive2 { name="cyclocomp"; version="1.0.0"; sha256="0a8xg5ivkswbmrmz7zby2ja3l0zdnpz3dlkwq1m4nbpjbyhkvlw5"; depends=[]; }; cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; - cymruservices = derive2 { name="cymruservices"; version="0.1.1"; sha256="1pqqqmsgicp87r9axv96qj61mmxrn50d8xnhfhjf7sklxkh57482"; depends=[stringr]; }; + cymruservices = derive2 { name="cymruservices"; version="0.2.0"; sha256="1pgk9llaz0glhgf3n60nq3xb8kp4jkk8paz4scxff3whyksxv4yn"; depends=[purrr stringr]; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; - d3heatmap = derive2 { name="d3heatmap"; version="0.6.1"; sha256="01lrz8r84yy5cdkl7ip2brwgfmyllg09zz2bayrb132xib21427x"; depends=[base64enc dendextend htmlwidgets png scales]; }; + d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; }; + dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; + dCovTS = derive2 { name="dCovTS"; version="1.0"; sha256="0lw4xdab231q83nmw2sx2abdwwqa0g7smzw14h6dabbzcdjw8h99"; depends=[doParallel energy foreach]; }; + dHSIC = derive2 { name="dHSIC"; version="1.0"; sha256="1vyrfzgb0mjddy89jagf9zqkw18b83yn6v2amhb333vnd56644fk"; depends=[]; }; dMod = derive2 { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; }; dad = derive2 { name="dad"; version="1.0.2"; sha256="06zgvspmq7vj23ir1yjxhavai282lxx14m8h18qjgwvw7q5c993y"; depends=[e1071 lattice]; }; dae = derive2 { name="dae"; version="2.7-6"; sha256="1mh4kprzzi3s6n9lfz1gq0djm9inlkydq43qpvm7wljk2hbcdqnr"; depends=[ggplot2]; }; @@ -3476,15 +3636,18 @@ in with self; { dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; dagbag = derive2 { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; + dagitty = derive2 { name="dagitty"; version="0.1-9"; sha256="077dnhg6wwi82ncn369mygdam0a5db1521kfng68aba2h540zm1a"; depends=[boot jsonlite MASS V8]; }; dams = derive2 { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; }; darch = derive2 { name="darch"; version="0.10.0"; sha256="0hs7w4p4azmbiif5b3fi4pngl33v16afwm2lnv8yhykh94y6y96q"; depends=[ff futile_logger]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; data_table = derive2 { name="data.table"; version="1.9.6"; sha256="0vi3zplpxqbg78z9ifjfs1kl2i8qhkqxr7l9ysp2663kq54w6x3g"; depends=[chron]; }; - data_tree = derive2 { name="data.tree"; version="0.2.4"; sha256="06mnl0kgwzgnwdvhy3hxasg51w1cjvnc507kl55bsrq4ak8s689k"; depends=[R6 stringr]; }; + data_tree = derive2 { name="data.tree"; version="0.3.0"; sha256="0imji1kvh9749sz3mqd9avqkcb73svw0vd9i8q5bwzqniqnkpzwi"; depends=[DiagrammeR R6 stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.3.1"; sha256="03f2mvxf1l3p6xx9d2l8yz8mib0p24j80bf02ws9yqsjn9gmcly2"; depends=[lubridate plyr RCurl reshape2 XML]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.5.2"; sha256="0j8jjzillxagyrm55ymm7xi502cigyzfidrq732rih56904lww2y"; depends=[curl dplyr httr lubridate readr reshape2 XML]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; + datacheckr = derive2 { name="datacheckr"; version="0.1.1"; sha256="0b5abanxk5l2vigchw8ir7akl2n4lbjxqndkkkf2c1sh7sx5hs4i"; depends=[dplyr magrittr]; }; + datadr = derive2 { name="datadr"; version="0.8.5"; sha256="1nlwfaidpypznc0yqfwx2z040pl40fm2l2dm8qzb68klvabgd0kn"; depends=[codetools data_table digest dplyr hexbin magrittr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.1.0"; sha256="1xnv55ls64b7b0ipr2zn5g6kg7f50bb5pnaxh3nz79yhawdr74fz"; depends=[caret GA Rcpp]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; @@ -3504,50 +3667,53 @@ in with self; { dbmss = derive2 { name="dbmss"; version="2.2-4"; sha256="13dvdylra6ladpvgm3imad6wqqb1gaqhbb3s5l2lywx58kxrpnl8"; depends=[cubature Rcpp RcppParallel spatstat]; }; dbscan = derive2 { name="dbscan"; version="0.9-6"; sha256="1a7x190lsz53p5n54zcmv02940ikpnc3jw8irybcal79yf0nqmb9"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; }; - dc3net = derive2 { name="dc3net"; version="1.0.1"; sha256="1pg29h391js55mqvx8867iwswjinbhygq3cccnxdk97jmv06vb4b"; depends=[c3net igraph RedeR]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; - dclone = derive2 { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; }; - dcmle = derive2 { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; }; + dclone = derive2 { name="dclone"; version="2.1-2"; sha256="0s3s46hvlsivfhrc559y0b3dc5m6g11cv3fwy4asigh8lqjc972d"; depends=[coda Matrix rjags snow]; }; + dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; }; dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; }; ddalpha = derive2 { name="ddalpha"; version="1.1.3.1"; sha256="0vi7crw30mfpllmspicilz1vwhbsmlzx2mfs53kv2hs8vj7r1in8"; depends=[BH class MASS Rcpp robustbase]; }; ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; }; + ddpcr = derive2 { name="ddpcr"; version="1.1.2"; sha256="0xz8ms77k24k47scs9x4vipdj370id783dxk30rdi94xcg8hns6m"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; ddst = derive2 { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; }; - deSolve = derive2 { name="deSolve"; version="1.12"; sha256="0npcayl6q2f32b3iflfgs7gg2slg4dfgdcz4awpllza0lwgzyyfj"; depends=[]; }; + deSolve = derive2 { name="deSolve"; version="1.13"; sha256="1amxkzakk5ipz06z50wm61i5p4a5kfvjqad5whwp6n5xq5msx621"; depends=[]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; }; deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; - decctools = derive2 { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[lubridate plyr RCurl reshape2 stringr XLConnect XML]; }; decisionSupport = derive2 { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; decompr = derive2 { name="decompr"; version="4.1.0"; sha256="1agzfy7iyyzh71pb56l7438bvpsx0q2z9mxh16fc8mfnywcl2jr2"; depends=[]; }; decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; + deconstructSigs = derive2 { name="deconstructSigs"; version="1.6.0"; sha256="1gs8ym0h99zh0ccd8akl72sj5lbangadh3fn5vwb6al7qgzpflfz"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 reshape2]; }; deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; }; + deductive = derive2 { name="deductive"; version="0.1.0"; sha256="1ivjn7v92v64gkbij5yqsr1090gnxjxxvnvmns1dwvycz32va6dp"; depends=[lintools stringdist validate]; }; + deepboost = derive2 { name="deepboost"; version="0.1.4"; sha256="08h1r9ganbcy2bljs7kccws16zs9ns0n0qspj8qczf87ya93vhfj"; depends=[Rcpp]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; - deldir = derive2 { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; }; + deldir = derive2 { name="deldir"; version="0.1-12"; sha256="1fzjcvalwhqyx2a0xcyvrxpi36av7x609cx3zalww19bm2xyr9mg"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; }; deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; demoKde = derive2 { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; }; - demography = derive2 { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; - dendextend = derive2 { name="dendextend"; version="1.1.2"; sha256="1sscpb02dilr5pnvy7a4d6x8g4har3vrn455g8xkc9i68zi3v06f"; depends=[magrittr whisker]; }; + demography = derive2 { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast mgcv RCurl strucchange]; }; + dendextend = derive2 { name="dendextend"; version="1.1.8"; sha256="0ssf0fzs1h2jc4p8p2z9fyf4f0p9942z3zrkawyafddbixkkz7vh"; depends=[magrittr whisker]; }; dendextendRcpp = derive2 { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; + dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; - densityClust = derive2 { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; + densityClust = derive2 { name="densityClust"; version="0.2.1"; sha256="0blq6h6x071bcy3shr77b3bwq1im0013vbg7gckdhljm859n07bh"; depends=[Rcpp]; }; denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; depend_truncation = derive2 { name="depend.truncation"; version="2.4"; sha256="09jcg6gr4dy0ayayn8qvbgncnw6v76xzif90c7v64a09snhh8qv6"; depends=[mvtnorm]; }; - depmix = derive2 { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; }; - depmixS4 = derive2 { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[MASS nnet Rsolnp]; }; + depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; }; + depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; }; depth = derive2 { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind circular rgl]; }; depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; }; depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; @@ -3556,16 +3722,18 @@ in with self; { descr = derive2 { name="descr"; version="1.1.2"; sha256="1bqr63s2w0gak117506f5v7k9wfj08cn6jy6idw5ii7x6jjh6xx7"; depends=[xtable]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; - desiR = derive2 { name="desiR"; version="1.1"; sha256="0f3inw0ndwbjbhbyrnfcjz828mk4n7nb5gq10v6jywcj6v1hx3sl"; depends=[]; }; + desiR = derive2 { name="desiR"; version="1.2"; sha256="0hznl6qf5np797j7a63sgggxrkz483fcfp42525vswgw3qsjvxlp"; depends=[]; }; designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; + designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; }; + designmatch = derive2 { name="designmatch"; version="0.1.1"; sha256="0s0mlisczf15zdw7jcl6lc4rhbzhfbpjjp2k64sjlvykcmzx5f04"; depends=[lattice MASS Rglpk slam]; }; desirability = derive2 { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; }; desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; desplot = derive2 { name="desplot"; version="1.0"; sha256="1x8x0nqmirmx4l8cdl5fqy01j5ljlnldjh5yz06qwjv4ykqd41dc"; depends=[lattice reshape2]; }; - detect = derive2 { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; + detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; devEMF = derive2 { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; }; - devtools = derive2 { name="devtools"; version="1.9.1"; sha256="10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci"; depends=[curl digest evaluate git2r httr jsonlite memoise roxygen2 rstudioapi rversions whisker]; }; + devtools = derive2 { name="devtools"; version="1.10.0"; sha256="11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; }; df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; dfcomb = derive2 { name="dfcomb"; version="2.1-5"; sha256="1dswkx3wqcpil6xs6xifr596iqy15ld473hdlrb6p760alqzx13s"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; @@ -3594,8 +3762,8 @@ in with self; { diffr = derive2 { name="diffr"; version="0.0.1"; sha256="0lhk9vm9gp0pwzsniy49dgq9vd4c1bxf8c8w8ib4b4fg5jq3hfwj"; depends=[htmlwidgets]; }; diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; }; - digest = derive2 { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whymhw0g0d98466ka694kya5x95hn44qih"; depends=[]; }; - digitalPCR = derive2 { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5jpzkpq8xc67zpv560q4vql5nwifm44dwar753"; depends=[]; }; + digest = derive2 { name="digest"; version="0.6.9"; sha256="0ixy1mb7kfl20lkckqiilpw03g1ip4ibihs03gicz7w625hc7zcm"; depends=[]; }; + digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; dina = derive2 { name="dina"; version="1.0.1"; sha256="1wjnpmjwvji41afp5pqx28w36a8jmszlcw0d3b8j82j681a5h882"; depends=[Rcpp RcppArmadillo]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; @@ -3610,14 +3778,15 @@ in with self; { discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; - diseasemapping = derive2 { name="diseasemapping"; version="1.2.7"; sha256="102rq8l3p0mlvy8vhrpad8m5c0hj872q9krxs88z9isqwakja14s"; depends=[sp]; }; - dismo = derive2 { name="dismo"; version="1.0-12"; sha256="1zm3z9z2ramsp85x96rrnmj5zabm8r7f0wfxrxg2sgddwwqvxpsv"; depends=[raster sp]; }; + diseasemapping = derive2 { name="diseasemapping"; version="1.4.0"; sha256="0hypk2y92x2q5jxm5qyjkzvqldz5037gclnxa6qx64bwylv2viam"; depends=[sp]; }; + dismo = derive2 { name="dismo"; version="1.0-15"; sha256="0ahm80dp839wfx04f9qkc4wwydidhqaiajba7jynqk60kw8hhl7g"; depends=[raster sp]; }; disp2D = derive2 { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; disposables = derive2 { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; + distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; distcomp = derive2 { name="distcomp"; version="0.25.4"; sha256="0drh7a79nvc6l6c0q2k9hva6kpb8ik6q2aiynp8ab8pf0dh84h6d"; depends=[digest httr jsonlite R6 shiny stringr survival]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; distillery = derive2 { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; }; @@ -3633,18 +3802,18 @@ in with self; { distrTeach = derive2 { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; }; distrom = derive2 { name="distrom"; version="0.3-3"; sha256="1kpbrsa7ml72zvmdcpbbz2rsv4lpqd5i2w3v488ji6nbi44v1gp6"; depends=[gamlr Matrix]; }; divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; - diveMove = derive2 { name="diveMove"; version="1.4.0"; sha256="1m16i9hchr7zcigz93n6q94lrc6xnm0skyscf92cp58cagz1c72w"; depends=[caTools geosphere KernSmooth quantreg]; }; + diveMove = derive2 { name="diveMove"; version="1.4.1"; sha256="13vgnjifvjsrhh3ns5l2gxwf80bg3a3j3n9ycblzjyjpl7i1960i"; depends=[caTools geosphere KernSmooth quantreg]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; }; diverse = derive2 { name="diverse"; version="0.1.1"; sha256="1k4fxaizasv47cnlijm8dhdb5lagqrmhn6g0nk6mhca21n3qdjsd"; depends=[foreign proxy reshape2]; }; diversitree = derive2 { name="diversitree"; version="0.9-8"; sha256="02cr8wrahm3kljj7gpmfwadjlca04a8gvm0i65436yj2lh4vxqa8"; depends=[ape deSolve Rcpp subplex]; }; - divo = derive2 { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[cluster RcppCNPy]; }; + divo = derive2 { name="divo"; version="0.1.2"; sha256="1g3wv89zjd5x0qic39jy81kl488gila3lwdjdilm9dxh4kb4dbw5"; depends=[cluster RcppCNPy]; }; dixon = derive2 { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[spatstat splancs]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; - dlnm = derive2 { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; }; - dma = derive2 { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; }; + dlnm = derive2 { name="dlnm"; version="2.2.3"; sha256="0b9gicyhdkx0pd0l883qr1sxmxi0qpwjk4allwp0dpr5y1nnrkzg"; depends=[mgcv nlme tsModel]; }; + dma = derive2 { name="dma"; version="1.2-3"; sha256="00nwx0835i4njlqxzizs9v29d3xkq2i7rdd24xzc9bzd0c4naq4d"; depends=[MASS mnormt]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="1.6-3"; sha256="15c5hvjjnr9c4sg34jx31abldjladls73rsszkqsdpd95li334xg"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; @@ -3665,17 +3834,17 @@ in with self; { dosresmeta = derive2 { name="dosresmeta"; version="1.3.2"; sha256="1v0hf8x0qjzhxwa60ri2vhjv05z9iaf90dvhpmjjjrgskb7qpcd9"; depends=[aod Matrix mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; }; - dotwhisker = derive2 { name="dotwhisker"; version="0.2.0.2"; sha256="1y4cx3fll6n30qgwdjdlrhlxqm256rpddlj4qjd8aa0z0s38rajg"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; }; + dotwhisker = derive2 { name="dotwhisker"; version="0.2.0.5"; sha256="1sigvyymyw7ayjg984zmwzsa45ywarjfczbxki8vj04sgkns0ss4"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downscale = derive2 { name="downscale"; version="0.1-0"; sha256="13bh5h4hmkic2sknj712545gkxgswcsxlyq61s7llddl7v3pcdym"; depends=[cubature minpack_lm raster Rmpfr sp]; }; + downscale = derive2 { name="downscale"; version="1.2-1"; sha256="10lri6k4w1jm2d8r2vj8qdjpdyr33al1vbd9s3s02lh48v8qgzif"; depends=[cubature minpack_lm raster Rmpfr sp]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; - dpcR = derive2 { name="dpcR"; version="0.2"; sha256="0ww1mhwi2mh1565vy0s7zwis0c5qfx533yg94sdcjl5ly4f65hj1"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; + dpcR = derive2 { name="dpcR"; version="0.3"; sha256="1k9gz1j1b25lhzw7ism7klahs1q8xfyq1wagj90j3nps9agn9chd"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive2 { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[digest gmp lattice Matrix matrixStats png R_utils stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.6.4"; sha256="08h2l6af64g37fbaqx8y0phzca6x1ppvmk6mmqy73k03467jq6mk"; depends=[digest gmp lattice Matrix matrixStats png R_utils stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; dplyr = derive2 { name="dplyr"; version="0.4.3"; sha256="1p8rbn4p4yrx2840dapwiahf9iqa8gnvd35nyc200wfhmrxlqdlc"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; }; dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; }; - dpmr = derive2 { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; }; + dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; @@ -3683,7 +3852,7 @@ in with self; { drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive2 { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[car gtools MASS multcomp plotrix scales]; }; drfit = derive2 { name="drfit"; version="0.6.4"; sha256="0n2dclq7y9npnhpx6nmidr4d6f3mn5z9ysjqp61yw1iwa4ymw3ks"; depends=[drc MASS]; }; - drgee = derive2 { name="drgee"; version="1.1.3"; sha256="0gib0f5l55md5zymi7j01g3dfif0j2ki01cy5nca6j0ag500k54j"; depends=[nleqslv survival]; }; + drgee = derive2 { name="drgee"; version="1.1.4"; sha256="1hfaaan7yxnznrwn5f866kp70r37gzml455vmplynrhx6ddd3rwy"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; drm = derive2 { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; @@ -3694,49 +3863,51 @@ in with self; { dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.2.9"; sha256="147c94bk73ss7bcliz4a65zx0lhf3gap9ygcc82yvf7sibpasnqd"; depends=[ggplot2 mgcv mrds nlme statmod]; }; dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; }; - dti = derive2 { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; + dti = derive2 { name="dti"; version="1.2-4.1"; sha256="0wn5hksv8szxslf1v5z2wnkscj3igl76swrapp1i6zlf5j9cjqp7"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.1.0"; sha256="1897ns6f8hg6s8k710yvx48f5m0zai0ifnsan6iva749c0nmrvv3"; depends=[dtw ggplot2 proxy reshape2 scales waveslim zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="2.0.0"; sha256="04gwi5nd7b4jq63h7d76qvn7p6ll2kk0864lfwhjh71a78gszh8z"; depends=[caTools doRNG dtw flexclust foreach ggplot2 proxy reshape2]; }; + dtwclust = derive2 { name="dtwclust"; version="2.1.1"; sha256="160r5n02z5kswy6y9i62qmm3n390q7xrkbb7plshvksy1d024zn3"; depends=[caTools dtw flexclust foreach ggplot2 proxy reshape2 rngtools]; }; dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; - dunn_test = derive2 { name="dunn.test"; version="1.3.1"; sha256="0pgrylwrdbhzdgcxvbg53afvmz37m0yf7lvigvdpdmix9gwkpnm8"; depends=[]; }; + dunn_test = derive2 { name="dunn.test"; version="1.3.2"; sha256="1w2hhv1fajxc4mxdzl4fnaxw7qz5lg9kr0jj1sdbjcfzs5v1sfl4"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive2 { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; - dygraphs = derive2 { name="dygraphs"; version="0.6"; sha256="0hyh9axkyizvdmzvy3pqdm2cfpww998vyrqjzqiyz426djp84j8q"; depends=[htmlwidgets magrittr xts zoo]; }; + dygraphs = derive2 { name="dygraphs"; version="0.8"; sha256="0jqwa021h6cgzgjcg0qg1j9wvszna64vin8cn2cd0pla57xbrdxp"; depends=[htmlwidgets magrittr xts zoo]; }; dyn = derive2 { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; }; dynCorr = derive2 { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; - dynRB = derive2 { name="dynRB"; version="0.5"; sha256="1rw89h3d7hb2jsl7q07pdv0kg7i06qqcngwyplfjcc2m2cvmx1wj"; depends=[caTools corrplot]; }; + dynRB = derive2 { name="dynRB"; version="0.6"; sha256="0kdbfhisw2ybqw1c7xcnlaqpsnj8vzh16iid69ajkvzxrm1qcwim"; depends=[caTools corrplot]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; - dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; }; - dynatopmodel = derive2 { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[fields hydroGOF intervals maptools raster rgdal rgeos shape sp spam topmodel xts]; }; + dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; + dynatopmodel = derive2 { name="dynatopmodel"; version="1.1"; sha256="100g131jmgb3by9j3v2n7f7jh9623vd7xf5frjkwrxvwzf0q1i3k"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; dynlm = derive2 { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; }; dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; dynsurv = derive2 { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; e1071 = derive2 { name="e1071"; version="1.6-7"; sha256="1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h"; depends=[class]; }; - eHOF = derive2 { name="eHOF"; version="1.6"; sha256="0zcm541h7gz0wa1v4c69xxnp44j4aaf93gwsrlha2wr2ywl4pbz7"; depends=[lattice mgcv]; }; + eHOF = derive2 { name="eHOF"; version="1.7"; sha256="1xjn36qx12nplzvqxfcdl8brh0897abvvmsw6x7zsdsl4m88q0pa"; depends=[lattice mgcv]; }; eRm = derive2 { name="eRm"; version="0.15-6"; sha256="0kdcdddyxp345bs5g9lipdy3s6c97bcrkgj4cd4c78s7gx4mk7ra"; depends=[lattice MASS Matrix]; }; - eVenn = derive2 { name="eVenn"; version="2.2.2"; sha256="1bj4wc5llrld62rc9w7i8l58wv0rm23ssi5325g7f1kzwbyash1g"; depends=[]; }; + eVenn = derive2 { name="eVenn"; version="2.2.3"; sha256="0qliicql4yx9rih8f9ywhv40sqzgy21sdd8rg2ly0nwqlyii3537"; depends=[]; }; eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; - earth = derive2 { name="earth"; version="4.4.3"; sha256="1cn5wkhjscxnwjakjlf2bjlcv6ryylw8kal26p90my3xmg7zdq33"; depends=[plotmo TeachingDemos]; }; - easyVerification = derive2 { name="easyVerification"; version="0.1.8"; sha256="0l70mxn5h5bf9234054qh37jba0x2ify9cqw6j4p871nc67j5d29"; depends=[pbapply RCurl SpecsVerification]; }; + earth = derive2 { name="earth"; version="4.4.4"; sha256="1i8lbn8brza7ggrrd8fkj24kj99lra47xbibv723hk0yxh4fgdpx"; depends=[plotmo TeachingDemos]; }; + easyPubMed = derive2 { name="easyPubMed"; version="1.5"; sha256="0s0c2iqqpiffch5pi2kkkrxymrhgys2iydpzci30x77knqx3cjba"; depends=[XML]; }; + easyVerification = derive2 { name="easyVerification"; version="0.2.0"; sha256="1az91skkkkg82sv287lkfmrhlwkrb235cghmrwgij1szx1askcvx"; depends=[pbapply Rcpp RCurl SpecsVerification]; }; easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; easynls = derive2 { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; + easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive2 { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; }; ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; }; - ecb = derive2 { name="ecb"; version="0.1"; sha256="192zi7p7jby1apy7bb1wikham27z5q3p1vg5cw9bhxfsjq94xf03"; depends=[curl httr rsdmx xml2]; }; + ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; ecd = derive2 { name="ecd"; version="0.6.4"; sha256="16jlgwyb6rmxsas6p1dgxpmfdinm422v4y1f62kh7ai0sjcf8hjm"; depends=[moments optimx polynom Rmpfr RSQLite xts yaml zoo]; }; ecespa = derive2 { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; }; ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; @@ -3754,10 +3925,13 @@ in with self; { ecp = derive2 { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; + edeaR = derive2 { name="edeaR"; version="0.3.2"; sha256="1z4df1i3fk40n6jzzwdldb00k6zbsf3k64np3b35k0fk1ij04cvq"; depends=[dplyr ggplot2 lubridate tidyr XML]; }; edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; }; + edfReader = derive2 { name="edfReader"; version="1.0.0"; sha256="0c2yhhfh779x5laicx11dgrxrr65wf85n29va9q55g8agrq5bfa4"; depends=[]; }; edgar = derive2 { name="edgar"; version="1.0.4"; sha256="1rj6dfyg76c0p5im1qag4xpv4v98r5slkhvyxy9r1ibnyga22ica"; depends=[ggplot2 R_utils rChoiceDialogs RColorBrewer shiny shinydashboard tm wordcloud XML]; }; + edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; - edgebundleR = derive2 { name="edgebundleR"; version="0.1.2"; sha256="02kwkbcpawngmivc9kqbrphzfczi2qxqyxhpyrinjlg22fivapld"; depends=[htmlwidgets igraph rjson shiny]; }; + edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; }; edmr = derive2 { name="edmr"; version="0.6.3.1"; sha256="1avb4gnw8s635yyn3sh20pmppsnz39s7r1pr8ggdc61ca1mkh2mk"; depends=[data_table GenomicRanges IRanges mixtools S4Vectors]; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; }; @@ -3765,16 +3939,19 @@ in with self; { eegkit = derive2 { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; }; eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; - eemR = derive2 { name="eemR"; version="0.1.1"; sha256="15dmcxw96wndl3xa967lgrvw71agxnx1infvpf6ybwzn1bkdqa7w"; depends=[dplyr fields ggplot2 pracma R_matlab Rcpp readr stringr tidyr]; }; + eemR = derive2 { name="eemR"; version="0.1.2"; sha256="1mcvn5hjqwr8hgp3rdyxr7lh7x35rjza530grd3ys9vfnsn4k44q"; depends=[dplyr fields ggplot2 pracma R_matlab readr stringr tidyr]; }; eeptools = derive2 { name="eeptools"; version="0.9.1"; sha256="0rgal6a5jjl572dqzc4zwmcqjsa12x8mv99c63bfmczp11f5hjmn"; depends=[arm data_table ggplot2 maptools memisc vcd]; }; - effects = derive2 { name="effects"; version="3.0-5"; sha256="1wdj403m221w8d92r22x730bz029sbp2b24jk3v8h7ncfp9d55nc"; depends=[colorspace lattice lme4 nnet]; }; + effects = derive2 { name="effects"; version="3.0-7"; sha256="055ws22k10vkcrbqvchdjnpmnklnk77wqx3rn7lyyry38bfn6xwn"; depends=[colorspace lattice lme4 nnet]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.6.1"; sha256="1b26ngy5n1yh2ry3vwkz3x497xw5wxbv7iywlk5j368rlb97sjbj"; depends=[]; }; + efreadr = derive2 { name="efreadr"; version="0.1.1"; sha256="1fkifml8g7hgg3qb19b9ljljzx9sbbpnb9xa18mvkxgmbw41qsy7"; depends=[dplyr ensurer magrittr readr]; }; ega = derive2 { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; }; egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; }; eggCounts = derive2 { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; }; egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; eha = derive2 { name="eha"; version="2.4-3"; sha256="1dfilgw9m4m78ny3fd89nl8f9c9y5z5bnj912hpbfff3v5yfm3iq"; depends=[survival]; }; + ei = derive2 { name="ei"; version="1.3"; sha256="1vx34mwh0hf9nbkzw4kw35z88bdp4mbgnylj6vcy4jql1q8i4yxf"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix rgl sp tmvtnorm ucminf]; }; + eiCompare = derive2 { name="eiCompare"; version="1.6"; sha256="0fn4mgjhlc8ys7xjwmv2awwwbr963p0d685rfpmvxbszzbfkb06s"; depends=[cubature data_table eiPack ellipse foreach mnormt msm mvtnorm plotrix plyr R_utils tmvtnorm ucminf]; }; eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; }; @@ -3782,24 +3959,26 @@ in with self; { eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; - elastic = derive2 { name="elastic"; version="0.5.0"; sha256="1riivxrzd5cxb81kj0xjp7vli63ds6s8ybbg3sbhjmkcvpyxsylz"; depends=[curl httr jsonlite]; }; + elastic = derive2 { name="elastic"; version="0.6.0"; sha256="1la9099ddhhnv713nhjlia9mali36y6xznbciqn3k91bml3b1am0"; depends=[curl httr jsonlite]; }; elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; + elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; elliplot = derive2 { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; }; ellipse = derive2 { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; }; elliptic = derive2 { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii4z35nws2gc00xkk0dncll0sf5nshcj8fl5"; depends=[MASS]; }; elmNN = derive2 { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; - emIRT = derive2 { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp RcppArmadillo]; }; - embryogrowth = derive2 { name="embryogrowth"; version="6.1.1"; sha256="1r73qv7lw16ffdam15wjrv7wq0fi9sviillzrj4vhgsiqprihwkv"; depends=[deSolve HelpersMG polynom]; }; - emdbook = derive2 { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[bbmle coda lattice MASS plyr rgl]; }; + emIRT = derive2 { name="emIRT"; version="0.0.6"; sha256="1nl7xri4dv8vxpfckkk0j1xlipacjkkd2n8hklb11fjjmmwm6rhd"; depends=[pscl Rcpp RcppArmadillo]; }; + embryogrowth = derive2 { name="embryogrowth"; version="6.2"; sha256="1l4xh7ay8jwf0qpp37171hmx06l2lwmy0x2gj8gzwdf30b29ldm5"; depends=[deSolve HelpersMG polynom]; }; + emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; }; emil = derive2 { name="emil"; version="2.2.3"; sha256="004s1l5fv6cjrp7l10hx57yfsbfx3lj6km58idmj18yqy9j194a1"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; + emojifont = derive2 { name="emojifont"; version="0.3.2"; sha256="0jb08mhxn3b060dnncbmn4lwd0xawbaj5laskpc9sr3i26cicxk8"; depends=[proto showtext sysfonts]; }; emov = derive2 { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; }; emplik = derive2 { name="emplik"; version="1.0-2"; sha256="1sx8hsvv36idraji2vic6x025wp41bg4p73zqp2d716wmhgdkwgj"; depends=[quantreg]; }; @@ -3817,20 +3996,20 @@ in with self; { ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; - entropart = derive2 { name="entropart"; version="1.4-3"; sha256="12ishzw0bxm4q1c3s0sjcsmfia2lw2z6shjilv142sm1qykhq1sw"; depends=[ade4 ape geiger vegan]; }; + entropart = derive2 { name="entropart"; version="1.4-5"; sha256="0fmwzwydqb9g4qyd7inp9v6vfwrziqp31720vxincq39lka187w2"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; - enviPat = derive2 { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; }; - enviPick = derive2 { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[readMzXmlData shiny]; }; - envlpaster = derive2 { name="envlpaster"; version="0.1-1"; sha256="1n52jc35dffxawc0k9h8vhkbv3dc8787zq0slsikrgj7zlfqkixl"; depends=[aster aster2 caTools MASS]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.0.1"; sha256="0p8zh45fvprx7zc6yc2c0k5n8ycsxcm052zlnyambw89g3dr6ix4"; depends=[fitdistrplus modeest sn]; }; + enviPat = derive2 { name="enviPat"; version="2.1"; sha256="1fy0afpvbv55bvbw2isaywi11svwag78007dr28xypd6lm4hfwym"; depends=[]; }; + enviPick = derive2 { name="enviPick"; version="1.4"; sha256="1jcjaa1kx6c3775k11ydn6sww0jg7kmmi8ikrk56q8j3wsbdhgyi"; depends=[readMzXmlData shiny]; }; + envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; - epandist = derive2 { name="epandist"; version="1.0.2"; sha256="0c2sfn3bc7f1rbasvymxaazw9ghq6kxswbcslvmlbnzhmmws8a6h"; depends=[]; }; - epanetReader = derive2 { name="epanetReader"; version="0.2.2"; sha256="0sp1z99cn74am5ms287g5437sjciqam3p7lv8qz4rs7va9hbyz9z"; depends=[]; }; + epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; + epanetReader = derive2 { name="epanetReader"; version="0.3.1"; sha256="01f9q8i57ym5dvhn2jqkdlr1id8cv63yasbzmbhgl03bfgsibaya"; depends=[]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; }; - epiR = derive2 { name="epiR"; version="0.9-69"; sha256="0p0y2afh4agzrd4fkfzd9hbk7lnzq6ldz01pbkszc7nrih4qd1y9"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="0.9-74"; sha256="1k5095lp7sby0xsdwki16g0yd22k06aiqr2xrgwss5i1vc08laid"; depends=[BiasedUrn survival]; }; epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; - epifit = derive2 { name="epifit"; version="0.0.4"; sha256="0p1gpz0avqyk5w3sass7k0g19r60bcmbnnhj90d0b57kg4vn95ax"; depends=[MASS]; }; - epinet = derive2 { name="epinet"; version="2.1.6"; sha256="134ksvcp0rxcl6h481i8bc0m5fkfqcrplhsybx3kx5jgb0n9v5mn"; depends=[]; }; - episensr = derive2 { name="episensr"; version="0.7.1"; sha256="1yp430p3dfxpjrbgsq4rzhzd1lzdcfzh8fmsrxd0dnjfrd8xkvyw"; depends=[ggplot2 gridExtra plyr trapezoid triangle]; }; + epifit = derive2 { name="epifit"; version="0.0.6"; sha256="0k72w9x81l7a6wn4syz0qjaijlhfaflkffd1cjz7szv6cfnl97s2"; depends=[MASS]; }; + epinet = derive2 { name="epinet"; version="2.1.7"; sha256="10mqc3xy24mjbk9np5mp41216hj6yc9jqxl3ybgysmd80y3qgf39"; depends=[network]; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epitools = derive2 { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; }; epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; }; @@ -3838,29 +4017,30 @@ in with self; { eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; equate = derive2 { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; }; - equateIRT = derive2 { name="equateIRT"; version="1.2-2"; sha256="1kvxhirsxgcqs079m7z852bdk3jpsaj8pvbfj96r8sy3hdsb1blj"; depends=[statmod]; }; - equivalence = derive2 { name="equivalence"; version="0.7.0"; sha256="0x9840kyyhdlj13r2rhijc6p0chvzyqp6lkxxf561pnprhkzzqdj"; depends=[boot lattice PairedData]; }; + equateIRT = derive2 { name="equateIRT"; version="1.2-3"; sha256="1v8hk50b132j5r2wg508cdww7slgwcik7y2zn7dy56qq2plb4mkz"; depends=[mirt statmod]; }; + equivalence = derive2 { name="equivalence"; version="0.7.1"; sha256="1nm4s92acin5c2qnvgsafx7c10jyxmqgh33ciq271ycciwc4idy3"; depends=[boot lattice PairedData]; }; erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; - erer = derive2 { name="erer"; version="2.4"; sha256="0dvmsjphgv4n54j9f6lsl3wxmy410vcgqzl2sgzm513h5jp19ymq"; depends=[ggplot2 lmtest systemfit tseries urca]; }; + erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; }; ergm = derive2 { name="ergm"; version="3.5.1"; sha256="1myn7vhvwvf443im58f2vwnq26asmybhwjk9fv77qs5ac5y594x6"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.2.0"; sha256="0qrldigkygr8k8v3njy0pclgv7z64dazknpf0m567i1nz8715yhy"; depends=[ergm network statnet_common]; }; ergm_graphlets = derive2 { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; }; ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; }; ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; - erp_easy = derive2 { name="erp.easy"; version="0.6.3"; sha256="0kmkj19dhbihhz0x0sj7r8cj7n032787qb55blvm8ky2vqb71y3h"; depends=[plyr]; }; + erp_easy = derive2 { name="erp.easy"; version="1.0.0"; sha256="0md4l48qb2z6c527ir1dwc51z8yw1jq7yx85fxzzg0wh1vzafp1z"; depends=[plyr signal]; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; + errint = derive2 { name="errint"; version="0.1"; sha256="1qv997cb1ndny9k74gg996yyl11dkk5wxklpnh9qr5wdkdc77hhk"; depends=[rootSolve VGAM]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; estimability = derive2 { name="estimability"; version="1.1-1"; sha256="049adh8i0ad0m0qln2ylqdxcs5v2q9zfignn2a50r5f93ip2ay6w"; depends=[]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; }; etasFLP = derive2 { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[fields mapdata maps rgl]; }; etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; }; - etma = derive2 { name="etma"; version="1.0-6"; sha256="10jvhycv8zg79mxg8y84bvl128m8ix9p7ybx5bmz4v02kmnhkcjs"; depends=[]; }; + etma = derive2 { name="etma"; version="1.0-8"; sha256="07vixcanjfwbgf0sv6fs7hsl7qhr171lwhkb0hs2j9mvx3f3by9l"; depends=[]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; }; - eurostat = derive2 { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; }; - eva = derive2 { name="eva"; version="0.1.2"; sha256="0bh06v7zs5460ya1yp6y9fkiwy6bnkkaiwqcdq143l3naca6j05r"; depends=[]; }; - evaluate = derive2 { name="evaluate"; version="0.8"; sha256="137gc35jlizhqnx19mxim3llrkm403abj8ghb2b7v5ls9rvd40pq"; depends=[stringr]; }; + eurostat = derive2 { name="eurostat"; version="1.2.21"; sha256="1fjknxmf6jzhnrckmldy8gzxlyvy8p3cy9lv2ky8l10ln1ccfbjl"; depends=[httr jsonlite tidyr]; }; + eva = derive2 { name="eva"; version="0.1.3"; sha256="0w425qf1k4h0dif1aav6kid58fyc7v71hz03xb9fbwrqpghwj7xb"; depends=[]; }; + evaluate = derive2 { name="evaluate"; version="0.8.3"; sha256="08d6164m9wqf9qq6yh1s9a0qxwqzqpsq7312hilzy79gxf9gixzr"; depends=[stringr]; }; evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; }; evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; @@ -3873,27 +4053,28 @@ in with self; { evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; evtree = derive2 { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; }; - exCon = derive2 { name="exCon"; version="0.1.12"; sha256="0zap8jzjxqqg0kzdhjbpn05d5lb4wpvqjdfds15z281gnb19k9hg"; depends=[jsonlite]; }; + exCon = derive2 { name="exCon"; version="0.1.14"; sha256="0wm111hy2i3ipf48826r2r5a61s5sjz96p54hwipwpy3j0ahzdsv"; depends=[jsonlite]; }; exact2x2 = derive2 { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; }; exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exams = derive2 { name="exams"; version="2.1-0"; sha256="13ca4r151424fprc1km58dxbhssvnjn6y6pa2m7wl95v796k20z9"; depends=[]; }; - excursions = derive2 { name="excursions"; version="2.0.16"; sha256="10z0mix7fx4pb9jpix5d00ch4i6jlvj2337s6ja916q6cczj21qr"; depends=[Matrix sp spam]; }; + excursions = derive2 { name="excursions"; version="2.1.1"; sha256="1snrfy1m03mf54v3k9r51zhbjsx05zhzf94rnf4mzyq15fdp22lq"; depends=[Matrix sp spam]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; + exifr = derive2 { name="exifr"; version="0.1.1"; sha256="0cxi8rcig03qwahdilawg4j3i9a8sv8sxgy0a68pxxmg556dwk0j"; depends=[foreach plyr]; }; expands = derive2 { name="expands"; version="1.6.1"; sha256="0hx7ggfxlb96dglm1290nn95hhrjjnjc8w39g0s9wq4lrdwfz8a7"; depends=[ape flexmix matlab mclust moments permute rJava]; }; expectreg = derive2 { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[BayesX mboost quadprog]; }; experiment = derive2 { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; }; expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; - explor = derive2 { name="explor"; version="0.1"; sha256="0yrm7qfmrpf8426c9chi936msvqpgvph0i0nygwiax89h6ds3294"; depends=[dplyr DT ggplot2 scatterD3 shiny tidyr]; }; + explor = derive2 { name="explor"; version="0.2"; sha256="0xlsbj6slp0i4nynhdy2c6vnc8phxkgswg32s0w7cm79v8aag3z1"; depends=[dplyr DT ggplot2 scatterD3 shiny shinyBS tidyr]; }; expm = derive2 { name="expm"; version="0.999-0"; sha256="1mlkp5d0hbm9nw0lmm7fbwl4b00633bpsg0yshwv0w3fw6dh75xb"; depends=[Matrix]; }; expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; }; expp = derive2 { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; - exreport = derive2 { name="exreport"; version="0.4.0"; sha256="0lm7zn1h86c64ar95ng1qi691ypk3p8ikqhj07vz2h7rnwkp3zjl"; depends=[ggplot2 reshape2]; }; + exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; }; extRemes = derive2 { name="extRemes"; version="2.0-7"; sha256="1dghhmwph65vhq2pnn461cxs1qrfm3kq8dqsilpfkm30jvblv8dv"; depends=[car distillery Lmoments]; }; extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; @@ -3904,14 +4085,14 @@ in with self; { extracat = derive2 { name="extracat"; version="1.7-4"; sha256="1dply8sx9r9vshi5dycxs7bchf5g33qbq7w6i5w830glfy0lk3i5"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; }; extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; - extremevalues = derive2 { name="extremevalues"; version="2.3.1"; sha256="1x1yqm4yif46l9znxba4m8sp3xwj6vrdlqz8jdspqin53jm69gzw"; depends=[gWidgets gWidgetstcltk]; }; + extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; }; extremogram = derive2 { name="extremogram"; version="1.0.0"; sha256="196y63q9hnkf3hgizcz8a40wcmwmrm5yfail9sjh3kb40sb3nipi"; depends=[boot MASS]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; - eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.1"; sha256="1m8ffrx1bkzpcl171d1crgbdrd1s6597snzl1c3d7glxb0wr7zhb"; depends=[broom dplyr ggplot2 lazyeval zoo]; }; + eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.6"; sha256="0azfakn5kh80bvywqf52wy3c0q5k13zcasniggjf273f5z1415pn"; depends=[broom dplyr ggplot2 lazyeval tidyr zoo]; }; ez = derive2 { name="ez"; version="4.3"; sha256="1ypdp52fy382p14hri7my98wpjpl13lp9mdfk5lndiafmd20zl3j"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; ezec = derive2 { name="ezec"; version="0.1.0"; sha256="157gnwikr1w5zfh2nbnvnhw7wq62b56yjhx5i63y8ds86vzhngvy"; depends=[dplyr drc]; }; ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; - ezknitr = derive2 { name="ezknitr"; version="0.3.0"; sha256="1z1y6wl0x1jgfzsdra471zifc57jwkw3c1lqdacybnsxfqp51dj1"; depends=[knitr markdown R_utils]; }; + ezknitr = derive2 { name="ezknitr"; version="0.3.1"; sha256="0786bp8k3jpzdk7a98m7203cghavs9zh114418fkwnlrjnwkhsna"; depends=[knitr markdown R_utils]; }; ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; }; ezsummary = derive2 { name="ezsummary"; version="0.1.9"; sha256="0fqg0slxg760km2gfd534xkl3g19p8imi7a8k2nmzac6lp92irj7"; depends=[dplyr reshape2 tidyr]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; }; @@ -3933,7 +4114,7 @@ in with self; { fOptions = derive2 { name="fOptions"; version="3022.85"; sha256="1v99j9kl4fcfg3l3149ss9dx1sg9fi2887qjd2aazpphmi7zk0pv"; depends=[fBasics timeDate timeSeries]; }; fPortfolio = derive2 { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp Rsymphony slam timeDate timeSeries]; }; fRegression = derive2 { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; - fSRM = derive2 { name="fSRM"; version="0.6.1"; sha256="0d545i4sqkmimy42jgryyafzxayr62prwa47x11v5kkd63gmn3j2"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; + fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[fBasics timeDate timeSeries urca]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; @@ -3950,10 +4131,12 @@ in with self; { fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; }; faoutlier = derive2 { name="faoutlier"; version="0.6.1"; sha256="02a93jswrq10r09kawxzvdb795bs0sym0yllb30697f9gd7bvyqz"; depends=[lattice lavaan MASS mirt mvtnorm sem]; }; far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; }; - faraway = derive2 { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; }; + faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; }; farsi = derive2 { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; + fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; }; + fastGraph = derive2 { name="fastGraph"; version="1.0"; sha256="05qbysc3arwg4hh0hxw84n4c004mndz8mgzbgsky4cb035bp99fa"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; fastICA = derive2 { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; }; fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; }; @@ -3977,21 +4160,23 @@ in with self; { fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="1.2.2"; sha256="0xmfx40ibpb29rq7w4wrwhk5v16dj690qh7lv0gjigvnah1x8ih8"; depends=[fda MASS mgcv rpart]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; }; + fdaPDE = derive2 { name="fdaPDE"; version="0.1-2"; sha256="1bbrpricxrsixc0na4bgxclrzw6px0n2k05v1rbvbhsf2v1985jj"; depends=[RcppEigen rgl]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.5.1"; sha256="172yrx3nvjii4whqsnpjvw3m5pd9jhfcjfqs21lqjk01jnna8m71"; depends=[doParallel foreach matrixcalc mvtnorm numDeriv Rcpp]; }; + fdapace = derive2 { name="fdapace"; version="0.1.1"; sha256="102rhycn0yqkhkai1gdjc7jcf14im7hcvwa8xprffx5pkjigrydg"; depends=[Hmisc Matrix numDeriv plot3D pracma Rcpp RcppEigen]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.6.0"; sha256="1gzm862nbadrqamfyfdkynxdprrapkvc5n9jvp2vi6xxr6mm35ck"; depends=[doParallel fields foreach matrixcalc mvtnorm Rcpp]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[edgeR MCMCpack]; }; fdrci = derive2 { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; - fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; + fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[RCurl]; }; fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; fechner = derive2 { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; - fermicatsR = derive2 { name="fermicatsR"; version="1.3"; sha256="0vv3i1f01rjsd17a8z2wcf3iv6xlwg7fki99z3p5h8m4g6jwljfk"; depends=[]; }; + fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; - ffbase = derive2 { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[bit fastmatch ff]; }; + ffbase = derive2 { name="ffbase"; version="0.12.3"; sha256="1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5"; depends=[bit fastmatch ff]; }; ffmanova = derive2 { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; fftw = derive2 { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; fftwtools = derive2 { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; }; @@ -4000,7 +4185,7 @@ in with self; { fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; fheatmap = derive2 { name="fheatmap"; version="1.0.1"; sha256="1ir666zwlrw00c8pzm7np91n8qajc4w38pkmn2r12zpmcivqhvpk"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; }; - fields = derive2 { name="fields"; version="8.3-5"; sha256="1s3488qn6jyc0596111x8m0vp4jcqxjjyyklc7z3mbmx0gy9nx49"; depends=[maps spam]; }; + fields = derive2 { name="fields"; version="8.3-6"; sha256="0gnjwzi6rbvlhk0ragq12f0wzva25ncfy4llipmfl4zxz91px4dk"; depends=[maps spam]; }; fifer = derive2 { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[MASS xtable]; }; filehash = derive2 { name="filehash"; version="2.3"; sha256="1nvf7qbnn6vjz68303xdm190iq0nwmmghyydcb4amx1ckbgric33"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; @@ -4018,9 +4203,9 @@ in with self; { fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; - fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.4"; sha256="0shbi5mmr9fw3cc2hn1yzd1ma9kid53ria9pbfkz1pk81n75krj1"; depends=[httr RJSONIO stringr]; }; + fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.5"; sha256="0qdsk4zb5xrqpaba2j76iarh5jdpij4vl97b3z7v3yijx7w4fsgl"; depends=[httr RJSONIO stringr]; }; fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-6"; sha256="17ip3qh07jgcklacv89r1g8a27cp7xpk4f61ps5v9affsn1vjmcg"; depends=[MASS survival]; }; - flacco = derive2 { name="flacco"; version="1.1"; sha256="12adbqkbz9cxb007g8yl31qzs32rwl4krx7wqx3wnabqshbqi2kw"; depends=[BBmisc checkmate]; }; + flacco = derive2 { name="flacco"; version="1.2"; sha256="0lwy9cl8xd11vr18hhyyq6kxcgsdqp7mvmvizw2rq2fkyw3k5nfa"; depends=[BBmisc checkmate]; }; flam = derive2 { name="flam"; version="3.0"; sha256="0c3j382sa7szqrpd0j8vcg19p6yn18jphd55cbvl0g6z0z76y53p"; depends=[MASS Rcpp]; }; flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; @@ -4030,7 +4215,7 @@ in with self; { flexmix = derive2 { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; flexsurv = derive2 { name="flexsurv"; version="0.7"; sha256="1mwqbp89mhmplyii7if5jmlv8593i48pv5i2l15javh2p0rqdzz6"; depends=[deSolve mstate muhaz mvtnorm quadprog survival]; }; flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; }; - flora = derive2 { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; }; + flora = derive2 { name="flora"; version="0.2.7"; sha256="0kr8gx9ckklvfifbchiyzxvby0aww7gwvh4bfd0fh6svdrin6dly"; depends=[dplyr httr shiny]; }; flowDiv = derive2 { name="flowDiv"; version="1.0"; sha256="1xgg73gbhysss82faqxn25l494sjbi3j0ls0dj6znzll8bhlrkb1"; depends=[flowCore flowWorkspace vegan]; }; flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; @@ -4047,7 +4232,7 @@ in with self; { foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; }; - forecTheta = derive2 { name="forecTheta"; version="1.1"; sha256="0cp582mwi9jf8nnb4p4hvzy86w8q12js3i8rp0gaq2xhm36w6v02"; depends=[forecast]; }; + forecTheta = derive2 { name="forecTheta"; version="2.1"; sha256="04kmhf0f27v6fajly81xyp8lrrvz1l69kx9gdxgdki8vm0zcnx2z"; depends=[forecast]; }; forecast = derive2 { name="forecast"; version="6.2"; sha256="0j4agcw11dzlwy90qqr2is0rhws73hphqsjfb4glw0min5vsw00v"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; }; foreign = derive2 { name="foreign"; version="0.8-66"; sha256="19278jm85728zb20800w6hq9q8jy8ywdn81mgmlnxkmrr9giwh6p"; depends=[]; }; @@ -4055,8 +4240,8 @@ in with self; { forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestFloor = derive2 { name="forestFloor"; version="1.9.1"; sha256="1kg7w75a1l9sfp1bq1srlc11dp19znb1nk2lw64yab7hwna5zknr"; depends=[kknn Rcpp rgl]; }; forestmodel = derive2 { name="forestmodel"; version="0.4.0"; sha256="1csw85zmj39zk3qr0238xjxj9qvp4fda62cqiliy5qm3a68kgpk3"; depends=[broom dplyr ggplot2 lazyeval]; }; - forestplot = derive2 { name="forestplot"; version="1.3"; sha256="1ia6xfagfp9l9wrmcjlqnvrwv61f5bk9x58ikf7asz5xdz8y3236"; depends=[]; }; - formatR = derive2 { name="formatR"; version="1.2.1"; sha256="0f4cv2zv5wayyqx99ybfyl0p83kgjvnsv8dhcwa4s49kw6jsx1lr"; depends=[]; }; + forestplot = derive2 { name="forestplot"; version="1.4"; sha256="0m6wrk2adfj82ggjigzisarzqlz59ffzdbiz1irf76wybivzggx6"; depends=[magrittr]; }; + formatR = derive2 { name="formatR"; version="1.3"; sha256="09fsd0z6nhksc1h921h8q28f87hr6d1q8d6dmpxphjylb9r5xmj4"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.1.5"; sha256="0kh3npzj42d0b21bbv9jidlkn9a8wldhg36ql5mgiiqyhva76qab"; depends=[htmltools htmlwidgets knitr markdown shiny]; }; formula_tools = derive2 { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; }; fortunes = derive2 { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; }; @@ -4074,9 +4259,10 @@ in with self; { fractal = derive2 { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[ifultools sapa scatterplot3d splus2R wmtsa]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; + fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.2.2"; sha256="00zi4lslcwgf5b8piaig6vh4gb8cnr4xcl425x0bw9hj9b1zsmq1"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="2.8.2"; sha256="0m78j9qzpvcs8p31m38h704yfwhivb3fpcqxh93vs14sysjlxxpj"; depends=[boot MASS nlme survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="2.8.3"; sha256="1kjqq8mhd85q6c2hnxljqphc0ksq6cnbrksnis4c1rx1wcwrwqdf"; depends=[boot MASS nlme survC1 survival]; }; frair = derive2 { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle boot emdbook]; }; franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; }; frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; }; @@ -4084,7 +4270,7 @@ in with self; { freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; freqMAP = derive2 { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="1.0.4"; sha256="0flx4316q8m9v5zy8bxjp18a25p1vwq6wvfs81r0g609ag54vy5b"; depends=[mvtnorm]; }; - freqparcoord = derive2 { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[FNN GGally ggplot2 mvtnorm]; }; + freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; freqweights = derive2 { name="freqweights"; version="1.0.2"; sha256="183x94j727z6phayy0zy9q4x5fnww8h51ghpmc6jbwc5r40vp4px"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; frmhet = derive2 { name="frmhet"; version="1.1.2"; sha256="1a6q5qz22b4sx5l1jz50x1q3bz8sj91dj2cahq28h6ss5b8vfn0y"; depends=[]; }; @@ -4099,31 +4285,32 @@ in with self; { fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="4.6"; sha256="1y261q8j8z8icpj56irpa657mlzhdidy8byvlfjxyz6dchpynbns"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; - fulltext = derive2 { name="fulltext"; version="0.1.4"; sha256="19vdlim5x8qqk7i74w967m0zxgmk30irv9jv4cs1cmp24pcwf050"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; }; + fullfact = derive2 { name="fullfact"; version="1.0"; sha256="1yda1fkpzzgzcm5m2iflvay9w3zbc31yx2sy30swjy92a2z4abm4"; depends=[afex lme4]; }; + fulltext = derive2 { name="fulltext"; version="0.1.6"; sha256="1k415wzcxbgbh3p38q61wymjy7a5dicy7k7q3d6syk3pc9nx1cmr"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; }; fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; + funModeling = derive2 { name="funModeling"; version="1.1"; sha256="1zdc6x75ksdm030pw8ldb00x5prlci29d6p6dbxiavwh9z4081z3"; depends=[ggplot2 gridExtra Hmisc pander plyr reshape2 ROCR scales]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; - funcy = derive2 { name="funcy"; version="0.8.3"; sha256="05ih0g9pj41dk8wxgjs04q95jb968q5qdnzw4h29rp95rjg6j8pz"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; - fungible = derive2 { name="fungible"; version="1.2"; sha256="16r615cjqg9np25cyn5hcr57h12vk0l4mcrkw1nzm3d9r6zmq5qw"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; }; + funcy = derive2 { name="funcy"; version="0.8.4"; sha256="1rgdldjjpy8zvll6lhx6al70iazg4vfd86jhyx1c50hpnnl0yajb"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; + fungible = derive2 { name="fungible"; version="1.3"; sha256="0rzvib56p7sbiqk0ac36fdfrsavivdw5123gkklw33qny3jzzvhp"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; }; funr = derive2 { name="funr"; version="0.2.0"; sha256="0fmqrjvzpc7jbs85fznw723k9xmpxvbj65nkfc9qrvskgmja4mjn"; depends=[]; }; funreg = derive2 { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; - funtimes = derive2 { name="funtimes"; version="2.0"; sha256="1dwb0jqgdhc4nrp4kadybbg4dd08crsijm8f6wz1wfzw2xp2sfqr"; depends=[Jmisc]; }; + funtimes = derive2 { name="funtimes"; version="2.1"; sha256="1h8d2x683a1s4inlbh5y4zijzyny1q902xa5any9hcb6svjfqr6z"; depends=[Jmisc]; }; futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[futile_options lambda_r]; }; futile_matrix = derive2 { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; - future = derive2 { name="future"; version="0.10.0"; sha256="1r8b8059g7b8rfc86xisc9llq9lhg9mnqpavhg4l1nmm6i4439g3"; depends=[globals listenv]; }; + future = derive2 { name="future"; version="0.12.0"; sha256="0cr8xddwkn9pwcrjvfd0z000sx233p3zafrp3b8waz6sh6zs1k7k"; depends=[digest globals listenv]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; }; fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; }; - fwi_fbp = derive2 { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; }; + fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; }; fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; @@ -4137,14 +4324,14 @@ in with self; { gRain = derive2 { name="gRain"; version="1.2-5"; sha256="1rzg8w36qhpar1kn1dvjw54j1i0anpqr9iv51i9gf4dm6s3afylq"; depends=[graph gRbase igraph Rcpp RcppArmadillo RcppEigen]; }; gRapHD = derive2 { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[graph]; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; - gRbase = derive2 { name="gRbase"; version="1.7-2"; sha256="1026jp3j2dyrqrqips4agl4cvjxzkk6jbxga33d49lzbxfqjpman"; depends=[graph igraph Matrix RBGL Rcpp RcppArmadillo RcppEigen]; }; + gRbase = derive2 { name="gRbase"; version="1.7-5"; sha256="1bl53dgv4n1hfy1ckp5wn9k5xnd97pdy07q8grd84vpi2fbdc454"; depends=[graph igraph Matrix RBGL Rcpp RcppArmadillo RcppEigen]; }; gRc = derive2 { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[graph gRbase Rgraphviz]; }; gRim = derive2 { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRain gRbase igraph Rcpp RcppArmadillo]; }; - gSEM = derive2 { name="gSEM"; version="0.4.3.3"; sha256="0lxz8g1wksdcppj2cia1z9wi590qjy2dvd4hfdkb7h3hi8397xb1"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.2"; sha256="1pwi8dn1nvi2zln6qs6j88brp42hgmgz8ffvg1f9s0rlbgj78jvn"; depends=[]; }; + gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; + gSeg = derive2 { name="gSeg"; version="0.3"; sha256="0dcvnxldvxmmzaz4cqpr40jpmny5l012m6j7xd5954bgfg06gs7w"; depends=[]; }; gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-6"; sha256="0xh1f9j1y3zifz8xrvyp41c8zdgqx8lx0cg1sdqhxv8j3mxibcsg"; depends=[digest]; }; - gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-3"; sha256="041d510rxghcj5h6zw5258f4jnj1j9ycq2kdh0kl81fjr8n992jv"; depends=[gWidgets2 memoise RGtk2]; }; + gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-4"; sha256="0vyms79ysmami1gfgjmvlqp62gbnxgwckdrbwhjkmlg9rdmbi9y7"; depends=[gWidgets2 memoise RGtk2]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest gWidgets2 memoise]; }; gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; }; gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; }; @@ -4153,15 +4340,15 @@ in with self; { gam = derive2 { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; }; gamair = derive2 { name="gamair"; version="0.0-9"; sha256="014fkysiyd49q9j0rrqh6wlp4pqz1q8lqgrqjxbp59x2mfhgxhsg"; depends=[]; }; gambin = derive2 { name="gambin"; version="1.3"; sha256="1gxlg7rngryxhixpvq6xswq7i5wm31ya6zllx5zdbh65b925hmxf"; depends=[]; }; - gamboostLSS = derive2 { name="gamboostLSS"; version="1.2-0"; sha256="10cgjby7kbxkay5xq9hpkqsddy3fd2yb5af5z6v0mb2pj3pnnrsr"; depends=[mboost]; }; + gamboostLSS = derive2 { name="gamboostLSS"; version="1.2-1"; sha256="0571wqxxpb1h0dd6fw6vz2f3n2id78k8zbc9zclzdhk5798y784c"; depends=[mboost]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; gamlr = derive2 { name="gamlr"; version="1.13-3"; sha256="05hxmhmgs83q6d5jhq9y5b5llk1pi2jf61286pmnwbzmdwdhrbr2"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="4.3-6"; sha256="1n74am1rjvyjz6dpbf0fs1i5z2bcygh171i15ckrzwsac6b9hziz"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="4.3-8"; sha256="1vgw5j8vw731my76z8xdcb1clg4hsim4gfkzv38w49hw64vijhlr"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; gamlss_add = derive2 { name="gamlss.add"; version="4.3-4"; sha256="1sbs6jc7ashmkv8qz953v8paq4783rzw3m82b8ils4qm53ni8m01"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; gamlss_cens = derive2 { name="gamlss.cens"; version="4.3-2"; sha256="0kakgvlx7g8v6wdlnjyganmvpnv8zqr1ml6n2saz913ykn3mkc77"; depends=[gamlss gamlss_dist survival]; }; - gamlss_data = derive2 { name="gamlss.data"; version="4.3-0"; sha256="072mgyalaspc5x099n6cc16k5ll1ry8f736114ffirf89yvinn0n"; depends=[]; }; + gamlss_data = derive2 { name="gamlss.data"; version="4.3-2"; sha256="056s441i25gxg52669nqvjc2xryaw5izbh5f8lcjgkflynhb102z"; depends=[]; }; gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; gamlss_dist = derive2 { name="gamlss.dist"; version="4.3-5"; sha256="0qq4nvcbh7s675bk3afv3wm0xdnzcbabdsbln8n16xgyvsiyr4pl"; depends=[MASS]; }; gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-2"; sha256="1hq0nv4l8z1iwbldf9vhdsgr0sd6jans90dvjgdvf2z66bvmc9i0"; depends=[gamlss gamlss_dist nnet]; }; @@ -4177,7 +4364,7 @@ in with self; { gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.2.0"; sha256="1fxjz8lr3bsj3vml4yvm8pm72wpmw7c97bgp7acjf0q7l9x0d4vq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; }; - gaston = derive2 { name="gaston"; version="1.3.1"; sha256="0jl7ga9pjzfgwv5wgg1qd1y1ycrrqipbw5sggkf3hdhd5197qw19"; depends=[LDheatmap Rcpp RcppEigen RcppParallel WhopGenome]; }; + gaston = derive2 { name="gaston"; version="1.4"; sha256="1bq2b8mdgs4a8mjs137i0rry82dqm4sdrydlhqs7f2maqb28j4zm"; depends=[LDheatmap Rcpp RcppEigen RcppParallel WhopGenome]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; gazepath = derive2 { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr48c21l7z6grlpgf9g02lh23p6900fjxq"; depends=[]; }; @@ -4185,8 +4372,10 @@ in with self; { gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; gbm = derive2 { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; + gbutils = derive2 { name="gbutils"; version="0.2-0"; sha256="1hi2kq4m7lrhd9yikf4qb0xccr6v1pp7kmly5j68xd3m95fi86rc"; depends=[]; }; gcbd = derive2 { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[lattice plyr reshape RSQLite]; }; gcdnet = derive2 { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; + gcerisk = derive2 { name="gcerisk"; version="16.1.2"; sha256="0i8h10yllxdl0az7byqisfx5x3s1nrp3xzp7myawmp4a0d11h1zc"; depends=[cmprsk ggplot2 survival]; }; gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; gcmr = derive2 { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; @@ -4195,18 +4384,18 @@ in with self; { gdata = derive2 { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.1-9"; sha256="174ngm0xg993gkmf70yaln98d2rpjvdx5ngf2aga1jzph6xxdj6d"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.1.5"; sha256="143nm65lfpsa1vzl5pddbry3bhk50xx8vw82k649j5n2hk1v00bi"; depends=[plyr raster Rcpp reshape2 vegan]; }; - gdtools = derive2 { name="gdtools"; version="0.0.6"; sha256="08qqricnbgl75y8w9iyv81hsd76za65vc40bb81m0731l7i846bg"; depends=[Rcpp]; }; + gdm = derive2 { name="gdm"; version="1.1.7"; sha256="1yqjg57ghrbn38i2llna1jppjfasrgxp696afzr9hgw1hlmyknsa"; depends=[plyr raster Rcpp reshape2 vegan]; }; + gdtools = derive2 { name="gdtools"; version="0.0.7"; sha256="1bmnf9d677f2jy8jnb9ymjz1qzm4yrd0qp6k5qrrly06jfffyx7g"; depends=[Rcpp]; }; gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; }; gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; }; geeM = derive2 { name="geeM"; version="0.8.0"; sha256="1glnzv06wsrxb1rp4p38w1hmnk4jvd78wymvffhkklwsrmg8jgw5"; depends=[Matrix]; }; - geepack = derive2 { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; + geepack = derive2 { name="geepack"; version="1.2-0.1"; sha256="0jipq3ylkvpg2qnwmfxlra6ad8lpsm8hllvqaiiddbhppqn9pj92"; depends=[]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; - geigen = derive2 { name="geigen"; version="1.8"; sha256="0k0x6six2zrwzcdxb5rng9x63lyv0vcqgliq9pcsi4qjsamgi8jc"; depends=[]; }; + geigen = derive2 { name="geigen"; version="1.9"; sha256="1klglmhfrfys7kn89wjkg7gk4sjsz538xkw5k8sk039wr0qxk8yj"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; gelnet = derive2 { name="gelnet"; version="1.2"; sha256="1npzgbwpsbd0rpyp46njyhwhas0k28nj8b5rz1jmhgn4xf156wkn"; depends=[]; }; gems = derive2 { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[data_table MASS msm plyr]; }; - gemtc = derive2 { name="gemtc"; version="0.7-1"; sha256="18n81ilyg5bjqggx53j0b1659m9silnrh95w872r0rllgw2bk1az"; depends=[coda igraph meta plyr rjags truncnorm]; }; + gemtc = derive2 { name="gemtc"; version="0.8"; sha256="00pjr9pcjvmlfbmssqwq2qh6cffgg7ach9nikjd5w086z0qnngis"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gemtc_jar = derive2 { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; @@ -4218,10 +4407,13 @@ in with self; { genderizeR = derive2 { name="genderizeR"; version="1.2.0"; sha256="1a7vafspdd64wr47k1z391ff1ri5f8bynlgn876khcxzhm2vwdva"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; + geneNetBP = derive2 { name="geneNetBP"; version="1.0.0"; sha256="0xvri7h4ka3rf5cghwpz7ci7hdqrwrqfnxvwb7jkba73y3rmpri9"; depends=[graph Rgraphviz scales]; }; + geneSLOPE = derive2 { name="geneSLOPE"; version="0.36.6"; sha256="0c2b42j39yz85rffh0a9iqvb5fk5my7a6354dcxjz9fwh0irfdxf"; depends=[bigmemory ggplot2 SLOPE]; }; geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; }; + genie = derive2 { name="genie"; version="1.0.0"; sha256="1g8iyls6fm6a7b08j1wc7qa5aksnfnarricwpl3csp9x8k5qifap"; depends=[Rcpp]; }; genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; }; genoPlotR = derive2 { name="genoPlotR"; version="0.8.4"; sha256="06c4flddv83nwjagnszl0sv92mbxf91qml8awhhxnrs1bna04f1p"; depends=[ade4]; }; genpathmox = derive2 { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[diagram mice plspm quantreg]; }; @@ -4232,69 +4424,84 @@ in with self; { geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; geoR = derive2 { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; }; geoRglm = derive2 { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; }; + geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; geocodeHERE = derive2 { name="geocodeHERE"; version="0.1.3"; sha256="10b1fgclv3199cglnip5xy0kgi3gi41q9npv7w3kajkrdknnxms4"; depends=[httr]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; }; geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; - geojsonio = derive2 { name="geojsonio"; version="0.1.4"; sha256="0m2n5ivlaz4lalwpl1f0pwpgb61ym8nvw8hnm5id4jihirhcn4rb"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; }; - geoknife = derive2 { name="geoknife"; version="1.0.0"; sha256="0snvrmpivaq0yqcbxhar8z5n2gh87ygil4zd076i6imbiml1p6mg"; depends=[httr sp XML]; }; + geojsonio = derive2 { name="geojsonio"; version="0.1.6"; sha256="1wksx97djj6s9fh580j414icn9ava58gix3bnikm94m9bv7yj32f"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; }; + geoknife = derive2 { name="geoknife"; version="1.2.1"; sha256="1azrprrcah2szc0nk0a3dsh87qlm9jbhm9lc8qbrjp5wary0bkdc"; depends=[curl httr sp XML]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; }; geomnet = derive2 { name="geomnet"; version="0.0.1"; sha256="0yrlyhvqaab7y9ifrwmg93vq4fxp1lc87xxqhnkhp7qj9mhrpr7p"; depends=[ggplot2 network sna]; }; - geomorph = derive2 { name="geomorph"; version="2.1.7-1"; sha256="071ykglgb7fz9hxkrk82r9rhf6rfpyahjw2kz881z5y3h1nsx01a"; depends=[ape geiger jpeg Matrix phytools rgl]; }; + geomorph = derive2 { name="geomorph"; version="3.0.0"; sha256="0yy4ln0g7wirbjzzh8c0cpnl6wsb0c0q82ic7kwjj0i213jxp2xd"; depends=[ape geiger jpeg Matrix phytools rgl]; }; geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; geophys = derive2 { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; - georob = derive2 { name="georob"; version="0.2-2"; sha256="1v2441gvna7kmyi6j2f85y8igrijmpgxj1jlckrcd0ichq2w1kvi"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; + georob = derive2 { name="georob"; version="0.2-3"; sha256="1amasfxjv3gd7199i3smk8dhgadw730l8cbj2pdpfwxwvwf2jlav"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; }; geosphere = derive2 { name="geosphere"; version="1.5-1"; sha256="06qwpaahpj2czs7rwv0rwnwlqjb4xanxyi00ci13b4imwb3w51q8"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostatsp = derive2 { name="geostatsp"; version="1.3.10"; sha256="1gfnw7nky8pvhsd8zgzd9lcyhw80wr86in51h1kwybj0hf5412x2"; depends=[abind Matrix numDeriv raster sp]; }; + geostatsp = derive2 { name="geostatsp"; version="1.4.0"; sha256="0anwqdwpsnivk421gaq4hpkx8m47m7jwll7qr7lnnssyljld7djc"; depends=[abind Matrix numDeriv raster sp]; }; + geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotopbricks = derive2 { name="geotopbricks"; version="1.3.7.2"; sha256="15z4969vgh0jwksqrjsd5m598xbz2ppf1ymvf80id4h0grzh08l5"; depends=[raster rgdal stringr zoo]; }; - geozoo = derive2 { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; + geozoo = derive2 { name="geozoo"; version="0.5.0"; sha256="1a91x4mdmha40xs2pgwbycni10yhavwmb2mwm0pjj1gg5j2d82ri"; depends=[bitops]; }; + gesca = derive2 { name="gesca"; version="1.0.1"; sha256="08yprp486gw6vgh5rc7nl1myx57fs1y7a36g01i7vd0g1ikcpqwj"; depends=[]; }; gesis = derive2 { name="gesis"; version="0.1"; sha256="0kvmlkq2cgxrjdq2dyjqs1pv875hdbapsygxrp0i8ab0fqirbrip"; depends=[RSelenium]; }; - getMet = derive2 { name="getMet"; version="0.2.1"; sha256="1i7vk1sypby16834ipkz3ma7yarsyp74y6y3r25aamx3ri5jz0jh"; depends=[EcoHydRology]; }; + getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; + getPass = derive2 { name="getPass"; version="0.1-0"; sha256="0jqlf4hl7g7jrwjm2y0syxm0csya2q3g2jlgsq9xfnyg56wa86qw"; depends=[rstudioapi]; }; getopt = derive2 { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; }; - gets = derive2 { name="gets"; version="0.4"; sha256="192w4rj6bz1fbhb9j35kzqada6qmhicd7gjjm8p1sk6i38j0iiy2"; depends=[zoo]; }; + gets = derive2 { name="gets"; version="0.6"; sha256="0x6f7nh4a5yzdwh9pfpx2gzqng1lpappa2m0729419v11rzwmrp8"; depends=[zoo]; }; gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; - ggExtra = derive2 { name="ggExtra"; version="0.3.1"; sha256="11hs67xxfm09sg7sd5l7hw4nhpx40k0r9vyj5yzarjbw2gj9vvrv"; depends=[ggplot2 gridExtra]; }; + ggExtra = derive2 { name="ggExtra"; version="0.3.4"; sha256="1lbwxmvxhfybywpzyh9h4qg962xckckfplv37w587fxa66kvs5xb"; depends=[ggplot2 gridExtra]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive2 { name="ggRandomForests"; version="1.2.1"; sha256="023badp3frvdmdq5acny4k6vq5xl78hsvr429060g9a8alrz51qy"; depends=[ggplot2 randomForestSRC survival tidyr]; }; - ggdendro = derive2 { name="ggdendro"; version="0.1-17"; sha256="1yl56w9b3yiadf29kdbi3rpsc20jl5r2jggsyi1g6wvq2nlksqx8"; depends=[ggplot2 MASS]; }; + ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.0"; sha256="18pmqwyk8sbbj1j55ixfda4hfss83lcvcgz2nkppjdvaifad2lyh"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; + ggalt = derive2 { name="ggalt"; version="0.1.1"; sha256="05jpvyl19ppyzprzprsp66aardn90fyw7q837vb56s49ivim7sk1"; depends=[ash dplyr ggplot2 gtable KernSmooth maps MASS proj4 RColorBrewer scales]; }; + ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.5.0"; sha256="0h8nl56pld7rlhw381pzngx8mznxr9d5vs0lwcz2j6sy9db2y53i"; depends=[beeswarm ggplot2 vipor]; }; + ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; }; + ggdendro = derive2 { name="ggdendro"; version="0.1-18"; sha256="13a807zgjjr4808h5bk2wkwmvx9v8nzl3zibd19gd5ah4mhmfx2z"; depends=[ggplot2 MASS]; }; gge = derive2 { name="gge"; version="1.0"; sha256="06a9czn3r76rg85z84177j3pd4mhsrskim1bxj3phc866chwj1wb"; depends=[reshape2]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; }; ggfortify = derive2 { name="ggfortify"; version="0.1.0"; sha256="0q4crp4syk2b48m2q38pc852y2bdy97spqrcjnl2q7yb3il1r90z"; depends=[dplyr ggplot2 gridExtra proto scales tidyr]; }; + ggiraph = derive2 { name="ggiraph"; version="0.2.0"; sha256="0z8gvqphww24w70hkvqvjh4afn5nk6blmvsvhghjhzgqgdwk1yyx"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; }; gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; - ggmap = derive2 { name="ggmap"; version="2.6"; sha256="17bjhhd8lm5dns9h8y2mw4r21m87aa34nxkl3hl5sr754n6pnw73"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; }; - ggmcmc = derive2 { name="ggmcmc"; version="0.7.2"; sha256="1qphizdx5pb6qzvdhrlvar6n8g7xrcm2zxi8c98ibgcws7jgj58b"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmap = derive2 { name="ggmap"; version="2.6.1"; sha256="0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; }; + ggmcmc = derive2 { name="ggmcmc"; version="0.8"; sha256="12dhhvqbmj20fk3c7h7qdvgc2hn83kb4gqwflsvgs7s8dmcdgy4i"; depends=[dplyr GGally ggplot2 tidyr]; }; ggparallel = derive2 { name="ggparallel"; version="0.1.2"; sha256="05l58qr5mxkkmwl444n0v27r527z64hxkh106am3aj7ml916z0qc"; depends=[ggplot2 plyr reshape2]; }; - ggplot2 = derive2 { name="ggplot2"; version="2.0.0"; sha256="07r5zw0ccv4sf1mdxcz9wa86p2c6j61cnnq18qdjrh3zhhcbmdp2"; depends=[digest gtable MASS plyr reshape2 scales]; }; + ggplot2 = derive2 { name="ggplot2"; version="2.1.0"; sha256="0s9rvp0f736ji6p9xpxq54agxf95pjkql4sj7ag0hv2xhnp27hzj"; depends=[digest gtable MASS plyr reshape2 scales]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; - ggsn = derive2 { name="ggsn"; version="0.2.0"; sha256="0wkzvcqasndkdp1vzip2xcml0pdvhm4pr5jzdxsy2k51k20d5m1g"; depends=[ggplot2 maptools png]; }; - ggsubplot = derive2 { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; }; - ggswissmaps = derive2 { name="ggswissmaps"; version="0.0.6"; sha256="18fljaj5sbwnaxr5c3r43jrgfal0i542sz4187n3v7j0p1afy51p"; depends=[ggplot2]; }; - ggtern = derive2 { name="ggtern"; version="1.0.6.1"; sha256="1hvh9688x2mzbyc0nndghsds0gn2sfg3kv94fzdl7vdn7sl7ag29"; depends=[ggplot2 gtable MASS plyr polyclip proto reshape2 scales sp]; }; - ggthemes = derive2 { name="ggthemes"; version="3.0.0"; sha256="1pj5cxsfm9g64abwya42kygpnzx95h111n028fqvad8magvn5l5g"; depends=[assertthat colorspace ggplot2 scales]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.2.7"; sha256="0m1fbxcizmnp0mild77ldfycz9yiq9d5zvyk1vvpx5ng79lf6lz9"; depends=[dplyr ggplot2 lubridate polynom splus2R xts zoo]; }; + ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; }; + ggrepel = derive2 { name="ggrepel"; version="0.5"; sha256="04kqmvr122lhb79y2wnwfx249sh8hkfd0p4gx13mb52qgzzd1f4r"; depends=[ggplot2 Rcpp]; }; + ggseas = derive2 { name="ggseas"; version="0.3.0"; sha256="08536kp45alhdm6r3vl7zc62by2q0rfmr67av9f664x6fx4q8xdi"; depends=[ggplot2 seasonal zoo]; }; + ggsn = derive2 { name="ggsn"; version="0.3.0"; sha256="02a4p15mqvfjxicwimp00nmd4bm7ydqxppxkxr11n2aqng9fjyrn"; depends=[ggplot2 maptools png]; }; + ggspectra = derive2 { name="ggspectra"; version="0.1.6"; sha256="1wvw9yjdb3jysg0nc6nfvhdbfzqh9i88rzin0bdw93gfq6fv969j"; depends=[dplyr ggplot2 lubridate photobiology photobiologyWavebands scales tidyr]; }; + ggswissmaps = derive2 { name="ggswissmaps"; version="0.0.8"; sha256="1y61xdhb67w0dmjmxa40pbzfjj6bpik477jf3dm61qjnfp4a1l4l"; depends=[ggplot2]; }; + ggtern = derive2 { name="ggtern"; version="2.1.0"; sha256="0icmw8cfm0ciay7vw7gfifq7mvccfq00qx167dh9nai12kkgnr0c"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; + ggthemes = derive2 { name="ggthemes"; version="3.0.2"; sha256="0nx4sswvzr8qr54pmxk7qqj85ayajpiakzz33sf27s622bh0gndd"; depends=[assertthat colorspace ggplot2 scales]; }; ggvis = derive2 { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; + ghit = derive2 { name="ghit"; version="0.2.5"; sha256="1164j18hh1jaziirvlrc0prmib0ph4dw16krpksxxymy6xxsvi9s"; depends=[git2r]; }; ghyp = derive2 { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; }; giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gimme = derive2 { name="gimme"; version="0.1-6"; sha256="164ayfhf532iv0ja87z5aigrbfngxs8naxdnh041lw431mchvrp6"; depends=[doParallel doSNOW foreach gWidgets2 igraph lavaan MASS qgraph snow]; }; - gimms = derive2 { name="gimms"; version="0.4.0"; sha256="1kg2xpzv51p18s0dzpfvcdygw8cx713npwhcyh959c2bya6f46pb"; depends=[doParallel foreach Kendall raster zyp]; }; + gimms = derive2 { name="gimms"; version="0.5.1"; sha256="149jk2j2vzvcn4pk78ha2vbjwq24kd42mvhkhw1ihmnjg6yjw7j3"; depends=[doParallel foreach Kendall raster zyp]; }; gistr = derive2 { name="gistr"; version="0.3.6"; sha256="1rajdfb8zkx444v89iapzrdad8y81rhd9q9nwcxw03jig4xm48mb"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; - git2r = derive2 { name="git2r"; version="0.13.1"; sha256="09alsn0nwvljc7qsq8jk257qzj63b2glwgfiw6rcqic5zj7xhmxd"; depends=[]; }; - gitlabr = derive2 { name="gitlabr"; version="0.5.1"; sha256="1k0jjxmnaga6v3867gkmpsa9knpsv6ysfg9xmd5c5avwl7d4xlbs"; depends=[base64enc dplyr functional httr magrittr stringr]; }; + git2r = derive2 { name="git2r"; version="0.14.0"; sha256="0jkkrggffpflaaw0gn2hnm1wz83xs31amriim481g73zf30g2bpr"; depends=[]; }; + gitlabr = derive2 { name="gitlabr"; version="0.6.4"; sha256="1x1s2wcfgzxbqjrrn9f5003q5x4ri19r6gbkd55qgqxnc1cg27gb"; depends=[base64enc dplyr functional httr magrittr stringr]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; + gjam = derive2 { name="gjam"; version="1.0"; sha256="1g85syk4cjrgvqwfjh63wzib9h7qpfg4l5qfa8lq9qz6m6g36gvb"; depends=[Rcpp RcppArmadillo]; }; gkmSVM = derive2 { name="gkmSVM"; version="0.65"; sha256="0k51mpcrddvxbvisn8aiwyh3iy1kwy7h0x1zl46wldy7s33d3576"; depends=[kernlab Rcpp ROCR seqinr]; }; glamlasso = derive2 { name="glamlasso"; version="1.0"; sha256="050xa2s60zm59p7ydxm3gkm2k6lhkdqkby212f5f1dd89q53gdxp"; depends=[Rcpp RcppArmadillo]; }; glarma = derive2 { name="glarma"; version="1.4-0"; sha256="1fwygp3baj4a5kfla0phaama81ry5s3i4vdx9hfj4y9m5wzg87dv"; depends=[MASS]; }; glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; - glcm = derive2 { name="glcm"; version="1.4"; sha256="0l0i6qji6sdjpy5yvlyvamd7jp40pf9kzf4ivqy3q2498mpnzrli"; depends=[Rcpp RcppArmadillo]; }; - gld = derive2 { name="gld"; version="2.3.1"; sha256="0zk192wp8q1v4ilwj9wilx9bgl1fcp92hgwqw2qb1c67bacfwy7a"; depends=[]; }; + glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; }; + gld = derive2 { name="gld"; version="2.3.2"; sha256="15l6lg49rypasglc1y8mjp5a6s7blymbyclavhyjs0nkaq5flrb7"; depends=[e1071]; }; gldist = derive2 { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; @@ -4307,19 +4514,21 @@ in with self; { glmm = derive2 { name="glmm"; version="1.0.4"; sha256="0mcdy8aa5dlscrdahnd7jn9ip28jzipp4imv6cyk8fkkmiy60qhx"; depends=[Matrix mvtnorm trust]; }; glmmBUGS = derive2 { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[abind MASS]; }; glmmGS = derive2 { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; - glmmLasso = derive2 { name="glmmLasso"; version="1.3.7"; sha256="1cpdlfd8zrlfdcjkn2wfv9x8nq1aky5b1f4h4firmd3lk13dx2iy"; depends=[minqa]; }; + glmmLasso = derive2 { name="glmmLasso"; version="1.4.1"; sha256="162b3mmx6997hlx4fpd3wpvwq5axzx2fvywljsn05a10c6cfszvc"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; }; - glmnet = derive2 { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[foreach Matrix]; }; + glmmsr = derive2 { name="glmmsr"; version="0.1.1"; sha256="07z4j7845hz3hcv438njnqf1yfp8prqby03h3s1ql1w8d342670i"; depends=[BH lme4 Matrix R6 Rcpp RcppEigen]; }; + glmnet = derive2 { name="glmnet"; version="2.0-5"; sha256="1cbpzmbv837fvq88rgn6mgzgr9f1wqp9fg8gh2kkmngvr1957a9c"; depends=[foreach Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; glmulti = derive2 { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; - glmvsd = derive2 { name="glmvsd"; version="1.3"; sha256="0grcncw7wisvy3sr7x7w67n30sa6pasvn4869q7bfd0jwbsr3l7k"; depends=[glmnet MASS ncvreg]; }; + glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; }; globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; - globals = derive2 { name="globals"; version="0.6.0"; sha256="0z9b630v75knsw8x6ln2nr1w3xpnaj7x0pjwsn9x4m9ps9bm9afh"; depends=[codetools]; }; + globals = derive2 { name="globals"; version="0.6.1"; sha256="0bwkk574b44ndm1frv16rhv5c200q1f6402k97d19gwh6rihw2h1"; depends=[codetools]; }; + globe = derive2 { name="globe"; version="1.1-2"; sha256="11y3dbi3x3idlwhzr5s2g976myci91l1qlsfyny732gb7q32c79w"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; @@ -4327,26 +4536,28 @@ in with self; { gmailr = derive2 { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[base64enc httr jsonlite magrittr mime]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="1.0"; sha256="14hwwnzx5jd8r2v34066pa59ngvxbmzhni0nc9hg7i3p0gzbfw4b"; depends=[RCurl XML]; }; gmatrix = derive2 { name="gmatrix"; version="0.3"; sha256="0ni5scx48m99jg9a5l93qvfkz6v5m7d5c0fwhp14mgiw32ff1s1r"; depends=[]; }; + gmeta = derive2 { name="gmeta"; version="2.2-6"; sha256="1zq5prig4mq6i8gkaynv8p786dbwh670bv0mapwmyns1r0yarzkm"; depends=[BiasedUrn binom]; }; gmm = derive2 { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-1"; sha256="0pdbky9gm8s3dvyg6z7pvn7wzqlbvdg7y0py9kcwfxxjvwcp1qwh"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; gmt = derive2 { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; gmum_r = derive2 { name="gmum.r"; version="0.2.1"; sha256="127h76nm99ldpaznys5y4rnrvq0kh5pcsjmw21hz79a8rjni7r16"; depends=[BH ggplot2 httr igraph Matrix Rcpp RcppArmadillo SparseM]; }; - gmwm = derive2 { name="gmwm"; version="1.0.0"; sha256="0x6rdjz4011wk1zs7hwdvz2hfn0ifa2lv9j4x6pmd38z83lcqj4n"; depends=[devtools ggplot2 gridExtra Rcpp RcppArmadillo reshape2 scales]; }; + gmwm = derive2 { name="gmwm"; version="2.0.0"; sha256="1cjmd0758ggjkpf5mkfdhwl121yv84gm1cwg6b2c1r8pd3wcqx57"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 scales]; }; gnm = derive2 { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnmf = derive2 { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; }; gnumeric = derive2 { name="gnumeric"; version="0.7-4"; sha256="0q9qrwwkrwcdh5c1prh7d8j4raca59vgaxx7rjh36cml372vkrai"; depends=[XML]; }; goalprog = derive2 { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; }; gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; }; - gofCopula = derive2 { name="gofCopula"; version="0.1-1"; sha256="15a0805xxlqgvz79ij7s5lyxpzca8hdjmp9dcc1i4vvqcm6k6y64"; depends=[copula numDeriv SparseGrid VineCopula]; }; + gofCopula = derive2 { name="gofCopula"; version="0.1-2"; sha256="09yczngqw6y9gx0fkwq5r80w44w8zng0mcxlman16mnlk6qcb0f7"; depends=[copula numDeriv SparseGrid VineCopula]; }; goft = derive2 { name="goft"; version="1.2"; sha256="1ic3dw287rkpnj7farsj44fy21q3a46krnvaq6clmqqlgwinwajv"; depends=[gPdtest mvShapiroTest]; }; goftest = derive2 { name="goftest"; version="1.0-3"; sha256="0rwz8y23dsklwvmd4sxq0bcklsa7l47lbs5lkcdn58jsdzm7bfrq"; depends=[]; }; gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; }; - googleAuthR = derive2 { name="googleAuthR"; version="0.1.1"; sha256="0b2j5ygxlaa1kljw16lkz4yn9r18bdblyncp9ffq7vpmx5fam4l6"; depends=[httr jsonlite R6]; }; + googleAuthR = derive2 { name="googleAuthR"; version="0.2.0"; sha256="1wbysvm8lafyjwva68hjggphb1i4nzp2mr00ywj42zlk30n17skk"; depends=[httr jsonlite R6]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; }; googleVis = derive2 { name="googleVis"; version="0.5.10"; sha256="00lh8nx8qims9zrb664m7g4psw2p5qwmmkb7gxlizmp1fccwvlq5"; depends=[RJSONIO]; }; - googlesheets = derive2 { name="googlesheets"; version="0.1.0"; sha256="0c3a521i2nw5v6ydz0ci7vbxlzfv3bh39yi7njah25zfbxjgm751"; depends=[cellranger dplyr ggplot2 httr plyr stringr tidyr XML xml2]; }; + googleformr = derive2 { name="googleformr"; version="0.0.1"; sha256="17v82njhnzp8p3lbd17dyxcv7p5vs0ivwq30asgv1mzpm19jm074"; depends=[httr magrittr rvest xml2]; }; + googlesheets = derive2 { name="googlesheets"; version="0.2.0"; sha256="07lyxjn2iqxwgngj3rfddq08d8ip8iyfs32kf7f4ncy4swk91lmp"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr XML xml2]; }; goric = derive2 { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; @@ -4358,7 +4569,7 @@ in with self; { gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; - gpuR = derive2 { name="gpuR"; version="1.0.1"; sha256="181vf565pvbx1ajy6h9ql793snssa4vwc9dgc24im86fq72ldils"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; + gpuR = derive2 { name="gpuR"; version="1.1.0"; sha256="1a5x9yy5iyyrvrzbiwnzlcr9ykd3cn6y29n9c5zlky1q8ivagsxy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gputools = derive2 { name="gputools"; version="1.0"; sha256="0zaib7f7mnx0pa7kxkza7m097d1zfn1ci8x9i8q4syfi06cs3s6n"; depends=[]; }; gquad = derive2 { name="gquad"; version="1.0-0"; sha256="0rfhcc7c0lfn4hqwcbly1kdpna9kr5ryvan279iydysv5iha96rr"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; @@ -4366,15 +4577,16 @@ in with self; { gramEvol = derive2 { name="gramEvol"; version="2.1-2"; sha256="18i97pj58scqpxhphn1cnb0n9a94ki0i6fgi1f99mrk17w2jwmi8"; depends=[]; }; granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; + graphTweets = derive2 { name="graphTweets"; version="0.3"; sha256="0kfj02pwg5jpq5barw7yr4ym3jhm6b2shk4a47yw7841rv93pdiz"; depends=[dplyr igraph reshape2]; }; graphicalVAR = derive2 { name="graphicalVAR"; version="0.1.3"; sha256="0awbcx8qb77r4qb90xinp49glwbkvyfb5f5y2qrjk8rr2jd62j0s"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; - graphicsQC = derive2 { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; }; + graphicsQC = derive2 { name="graphicsQC"; version="1.0-7"; sha256="14xpczrxaxzm02figrnzgz4a7g4r4rd1j9mfh0lw6xnbj2wf0p13"; depends=[XML]; }; graphscan = derive2 { name="graphscan"; version="1.1"; sha256="1v56g1gzlls78mdad9wllyq7zywmjzamrcxw0pk655nwjbqfiyw5"; depends=[ape rgl snowfall sp]; }; - graticule = derive2 { name="graticule"; version="0.1.0"; sha256="14shfaqmlxnvw7n6rh6n4189mz7hly72n2yq9m119r3ymrhjs79g"; depends=[raster sp]; }; + graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; greport = derive2 { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; - gridExtra = derive2 { name="gridExtra"; version="2.0.0"; sha256="19yyrfd37c5hxlavb9lca9l26wjhc80rlqhgmfj9k3xhbvvpdp17"; depends=[gtable]; }; + gridExtra = derive2 { name="gridExtra"; version="2.2.1"; sha256="0638ihwl00j76ivaxxhxvi8z573lwy1jym3srr78mx6dbdd4bzj4"; depends=[gtable]; }; gridGraphics = derive2 { name="gridGraphics"; version="0.1-5"; sha256="1fsw699xk56iiwscrf98a1b0m2xpmvfqqsb7aja49fhv8qam6szf"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.5-0"; sha256="15d35066213hwsxsvmnqxqm4wim850645jwajw4pa190v8sapl89"; depends=[RJSONIO XML]; }; @@ -4386,53 +4598,58 @@ in with self; { grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; growcurves = derive2 { name="growcurves"; version="0.2.4.0"; sha256="1ybhcw3kjsgpssilsg1kdg0az61s16mi1cbk4qgcvsb291f3m4i3"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; }; growfunctions = derive2 { name="growfunctions"; version="0.12"; sha256="08ip90k36hq2c6zp1ys27xb9n5d2aafw8carj6vjszb057khmnxh"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; - growthcurver = derive2 { name="growthcurver"; version="0.1.0"; sha256="0r0bfvlkjd4jl0vpi5h5kzd3lfrgsmbn3d9qzs08wgzy3jvavmnq"; depends=[caTools minpack_lm]; }; + growthcurver = derive2 { name="growthcurver"; version="0.2.0"; sha256="062azq7fix1cpbx779636zv404z75niz40grxfqsh02afabg5ki4"; depends=[caTools minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; + growthrates = derive2 { name="growthrates"; version="0.6.5"; sha256="1bnp51hlcb2gpm7j9llbnxjgimbrdsshjxl19ka9w1ba423v2ja2"; depends=[deSolve FME lattice]; }; grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; grpreg = derive2 { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; }; grpregOverlap = derive2 { name="grpregOverlap"; version="1.0-1"; sha256="09s3gp59z703zqhpnqzqhkd454b5rlq1cgdhcvql2ad4csxxs03x"; depends=[grpreg Matrix]; }; grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; }; + grr = derive2 { name="grr"; version="0.9.2"; sha256="07vw0m1ynjanx6520zx8nycmgxj53p3a5bdznaj9zjfqmy9qyjgm"; depends=[]; }; grt = derive2 { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS misc3d rgl]; }; - gsDesign = derive2 { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 plyr RUnit stringr xtable]; }; + gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; }; + gsEasy = derive2 { name="gsEasy"; version="1.0"; sha256="0fbcajnczgmf8gr080rmkg2wxfinjyv6wwznism4m4jlycq4cbjj"; depends=[ontologyIndex Rcpp]; }; gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="0.96-3"; sha256="03q2lxz6x4zpwnn15a7mda2qv0d5xrsz563y7103gnmdxnxqqsbc"; depends=[gsDesign lattice]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; }; - gsheet = derive2 { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; }; + gsheet = derive2 { name="gsheet"; version="0.2.1"; sha256="02fz7yvav3cl1cdjb6iqbgaiz25r6xnc92kz0b30qlkvv70995cs"; depends=[magrittr rvest stringr xml2]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive2 { name="gsl"; version="1.9-10.1"; sha256="0pbxzn5zkaskaqn308bj8s78v65fngmqkzxms3ji5x6azgcgfzvp"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gss = derive2 { name="gss"; version="2.1-5"; sha256="19bysbh6n04psv0mgvlhkpkc463f6zfiwbdsvd28fakbzcwwm8h2"; depends=[]; }; gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; }; - gstat = derive2 { name="gstat"; version="1.1-0"; sha256="0z4nxs08mrb7w6222rq3lq6dxhbzkgarb10cx638syb3rqamkf5p"; depends=[FNN lattice sp spacetime zoo]; }; + gstat = derive2 { name="gstat"; version="1.1-2"; sha256="1b7364g38s3w2h958cbvyk94cry1y0k32z5mr5r290yygr2nzqyn"; depends=[FNN lattice sp spacetime zoo]; }; gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; - gtable = derive2 { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; }; + gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; - gtrendsR = derive2 { name="gtrendsR"; version="1.3.1"; sha256="0gi39h6f8ylir40bgjgi5v5l8lhg5668jbqz7gdxnscq9zv1innd"; depends=[ggplot2 googleVis RColorBrewer RCurl zoo]; }; + gtrendsR = derive2 { name="gtrendsR"; version="1.3.3"; sha256="06z58av7fkmnvb0jmz8g5xffdnpm11iz3lvnvq4az7lq33r2vmah"; depends=[ggplot2 googleVis RCurl zoo]; }; gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; + guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; }; + gunsales = derive2 { name="gunsales"; version="0.1.1"; sha256="112rir0jsfifp0hwhcnahfyz5fbz6nk8hz7mwz4xfj7jy04m0cbx"; depends=[data_table dplyr ggplot2 readr seasonal stringr x13binary zoo]; }; gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; - gyriq = derive2 { name="gyriq"; version="1.0.1"; sha256="0dnln074nhnh5bp6c57phsykm6l69x78ig6rlyyvsgsrlf5nbkbm"; depends=[CompQuadForm irlba mvtnorm survival]; }; - h2o = derive2 { name="h2o"; version="3.6.0.8"; sha256="1d51ffmsrsy5vyg16v78ld8f7hbdjgnlxp6fhxmmg8zcayg9ja91"; depends=[jsonlite RCurl statmod]; }; - h5 = derive2 { name="h5"; version="0.9.4"; sha256="0khmp3lsqpqbg0959wl46zkg9b8j59m4i7vrh5m8q2lmil8pak3r"; depends=[Rcpp]; }; + gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; + h2o = derive2 { name="h2o"; version="3.8.1.3"; sha256="1cp2h7n3na4cwysw8di7lig0gbldji2s7f1r7d8a8a11wikvz6zy"; depends=[jsonlite RCurl statmod]; }; + h5 = derive2 { name="h5"; version="0.9.5"; sha256="1awp1pwfcdss3gd8jxps2ki4j0a2m8y5703jm1dfycgp5blkwqz4"; depends=[Rcpp]; }; hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hail = derive2 { name="hail"; version="0.1.0"; sha256="1i76hjfiad0l8vpjslnglp1irdzs419ad7q6clnbs3gganbszipy"; depends=[]; }; hamlet = derive2 { name="hamlet"; version="0.9.4-2"; sha256="01zy6afiy7n28bbx5cwdy6hs82l1rakbwx2gn04kk6famqgmklwp"; depends=[]; }; hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; - haplo_stats = derive2 { name="haplo.stats"; version="1.7.1"; sha256="06c1wficlzxmc4k4w0ghabka6if7jqbbqnfr6xcaf7rvwqj75l9a"; depends=[rms]; }; + haplo_stats = derive2 { name="haplo.stats"; version="1.7.6"; sha256="16ll5a8w85yjqy9as5hyg59sbhwmfcf9wcnjl7v7s3qf9zz86211"; depends=[rms]; }; haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; }; harvestr = derive2 { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[digest plyr]; }; hash = derive2 { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; @@ -4450,21 +4667,21 @@ in with self; { hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; }; - hda = derive2 { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; }; + hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; }; hddplot = derive2 { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS multtest]; }; hddtools = derive2 { name="hddtools"; version="0.2.4"; sha256="001cm07jvbxzsp64mkjymnsncyrd6r1nxwhjqkk2mb5ldz0541ir"; depends=[raster RCurl rgdal sp XML zoo]; }; hdeco = derive2 { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; }; - hdi = derive2 { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; }; + hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[foreach glmnet iterators MASS]; }; - hdnom = derive2 { name="hdnom"; version="2.1"; sha256="1p09249587bdhcvlz4mj46akrb41swl7z3hnnqw46ypl0r0vvvqx"; depends=[foreach glmnet ncvreg penalized rms survAUC survival]; }; - hdr = derive2 { name="hdr"; version="0.1"; sha256="0dgp4442mfvri8vhicp02nrv55z13r6664x2nlcq6vh6xz9pqyl0"; depends=[httr]; }; + hdm = derive2 { name="hdm"; version="0.1.0"; sha256="10iy6k9gkqm1lx0clin3a5fb1sjxbgrcfx1y6mzkr7kms1a3amdp"; depends=[checkmate ggplot2 glmnet MASS]; }; + hdnom = derive2 { name="hdnom"; version="3.0"; sha256="1cp5104ck7cb4gsqfqnafza87rfd8zylwns2yz0cv4z1mw1z7p7j"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; }; - heavy = derive2 { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; }; - heemod = derive2 { name="heemod"; version="0.1.0"; sha256="1c59dyjrqwcwic122g7r2plhvwsj317njmn24n7qzwhbjzwznwn6"; depends=[dplyr lazyeval purrr]; }; + heavy = derive2 { name="heavy"; version="0.3"; sha256="0vghk0f1h7qvjs2k41vwh0zq54njdh99gz8cpsbp8pk17xsmv3lv"; depends=[]; }; + heemod = derive2 { name="heemod"; version="0.3.0"; sha256="1m90b3mgjfxfnicjxwszhg3zl496sq12wzldarj2ah8pjhkx7xlz"; depends=[diagram dplyr DT ggplot2 lazyeval logitnorm memoise mvnfast rgho tidyr]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive2 { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; }; @@ -4484,7 +4701,7 @@ in with self; { hgm = derive2 { name="hgm"; version="1.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; }; hht = derive2 { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; - hiddenf = derive2 { name="hiddenf"; version="1.3"; sha256="02vdvvhfas8ziyipm13ihmvas4krgzifz5dg513p5qy2lzvz6xd3"; depends=[]; }; + hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; hierNet = derive2 { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; @@ -4494,26 +4711,27 @@ in with self; { hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; }; highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; + highcharter = derive2 { name="highcharter"; version="0.2.0"; sha256="114ds4lxqgxcv1lhbk01brk9mzs7jc6c0lmcr9pl1kwff5qj9zgz"; depends=[assertthat dplyr htmlwidgets magrittr purrr quantmod rlist stringr tidyr viridisLite xts zoo]; }; highfrequency = derive2 { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; }; highlight = derive2 { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; }; - highmean = derive2 { name="highmean"; version="1.0"; sha256="014h2k8nb7w83k2mw04zgmpmxv4p6dsp4ddcagc64pnp7dlnihf1"; depends=[MASS mvtnorm]; }; + highmean = derive2 { name="highmean"; version="2.0"; sha256="126kh0bql0yjakacm0wxxjrfz0x8x9hlyb9j0mrjb4dnggji21j3"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.5.1"; sha256="11hyawzhaw3ph5y5xphi7alx6df1d0i6wh0a2n5m4sxxhdrzswnb"; depends=[]; }; - highriskzone = derive2 { name="highriskzone"; version="1.3"; sha256="12ahbagbv83pk74625i83cl9cj16bhhf9q6bzda248kl65szzz70"; depends=[deldir fields ks Matrix rgeos spatstat]; }; + highriskzone = derive2 { name="highriskzone"; version="1.3-1"; sha256="1jw2kf9i81h1chgbdhzw1hh3aq2hfiay58jkyzn4rdwmw21jkgs5"; depends=[deldir fields ks Matrix rgeos spatstat]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hisemi = derive2 { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; }; - hisse = derive2 { name="hisse"; version="1.3"; sha256="017d02gn4yffs65cyyix4dq2h5i9k1qbawb0mr6ahp8mb0wf1k17"; depends=[ape data_table deSolve GenSA phytools subplex]; }; - histmdl = derive2 { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; }; + hisse = derive2 { name="hisse"; version="1.5"; sha256="14vyzc3dg5bdq17762kl1dqlh20ldnzv27ml0i9s5hrgk5235v44"; depends=[ape data_table deSolve GenSA phytools subplex]; }; + histmdl = derive2 { name="histmdl"; version="0.5-1"; sha256="085m6g7ykg3n89pwvagdjhpgcxy68wdq7jmmc2aja1qigq9kjhri"; depends=[]; }; histogram = derive2 { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; - hit = derive2 { name="hit"; version="0.2-0"; sha256="1kx2hmjx9ga0q0sl3jqh9zvkwynzx903n291nvgspsxv4p88x6dd"; depends=[glmnet Matrix Rcpp speedglm]; }; + hit = derive2 { name="hit"; version="0.2-1"; sha256="17dry6ha261z9a2v6iwfsij8wgivhfg991pfkjwv6ysjfiwy8wds"; depends=[glmnet Rcpp speedglm]; }; hitandrun = derive2 { name="hitandrun"; version="0.5-2"; sha256="0451rdnp3b4fcdv4wwdxv3wplkxqmidxh4v5n1jjxinnzvl5dv9a"; depends=[rcdd]; }; hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; }; hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; }; hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; }; - hnp = derive2 { name="hnp"; version="1.1"; sha256="0biqyvk0pl4l83j1zhddya7c0bh5hmifpwjzdbc7svjyn1aj63vh"; depends=[MASS]; }; + hnp = derive2 { name="hnp"; version="1.2"; sha256="1qpvdhyp62mrr5cldpnh0qlfjfkilpzqdzqq9r9rjnm4q7241r7q"; depends=[MASS]; }; hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; }; hoardeR = derive2 { name="hoardeR"; version="0.1"; sha256="1a3kf676mchrla9g0b619dx09ihxvlmahgwlbwqny6zwr49w7vzl"; depends=[httr MASS R_utils stringr XML]; }; holdem = derive2 { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; }; @@ -4521,34 +4739,39 @@ in with self; { homeR = derive2 { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; }; homomorpheR = derive2 { name="homomorpheR"; version="0.1-1"; sha256="0bisbaglv6l8nzcvl9arly9ns2hwyjj6bwplaf6ynyac7fgmmd6j"; depends=[gmp R6 sodium]; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; + hopbyhop = derive2 { name="hopbyhop"; version="1.0"; sha256="1nr4g9nz9lkkxi4glyi1ka0k4pz9vapv0k10k1ngqm0cqy64xsgn"; depends=[]; }; hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; - hot_deck = derive2 { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7f3ns8kk308f6b6lhwfpjqfz0wgysnfq9"; depends=[mice]; }; + hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; hotspots = derive2 { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[ineq lattice]; }; + housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; }; howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; }; hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; }; hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; - hqreg = derive2 { name="hqreg"; version="1.0"; sha256="08f6yijsmd0f3b5yxgdzfv6hqxhc8hbbpn2bmgivmpfssh84mcnn"; depends=[]; }; + hqreg = derive2 { name="hqreg"; version="1.2"; sha256="1rcna9brzyzxhg50f5g1pjhyd9c8s2pvzajzavh9f81lyfjfzpyd"; depends=[]; }; hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; - hsdar = derive2 { name="hsdar"; version="0.3.1"; sha256="0hplwzq21mnfc04ws3ciz0mxxcr2rsq36vsjwgd1qw1ill4n2kbf"; depends=[raster rgdal rootSolve signal sp]; }; + hsdar = derive2 { name="hsdar"; version="0.4.1"; sha256="10x8488alik3yy09v0slr9lrgymxwnd9w9q7zyxx7ir1p0ijgjgr"; depends=[caret raster rgdal rootSolve signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; }; - htmlTable = derive2 { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; }; + htmlTable = derive2 { name="htmlTable"; version="1.5"; sha256="1pjmxh3w0iarfzm9krhdqc1931mvcfq4262rmdmpfmq0r1is7qgi"; depends=[knitr magrittr stringr]; }; htmltab = derive2 { name="htmltab"; version="0.6.0"; sha256="00171fsdgv3rks6j4i5w8rbk2kar2rbmqqpqrr2xdxkjqxsf6k4b"; depends=[httr XML]; }; - htmltools = derive2 { name="htmltools"; version="0.3"; sha256="1aa9w97rgw7zl63qswbd4cbf1wszcfikaf09m1fs50r5h25qdg35"; depends=[digest]; }; - htmlwidgets = derive2 { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4sq0y1scri7fs48z6q17c051nyjywcvnpy4lvi8j"; depends=[htmltools jsonlite yaml]; }; + htmltools = derive2 { name="htmltools"; version="0.3.5"; sha256="0j9bf80grd6gwh7116m575pycv87c0wcwkxsz3gzzfs4aw3pxyr9"; depends=[digest Rcpp]; }; + htmlwidgets = derive2 { name="htmlwidgets"; version="0.6"; sha256="1sljs7zajzj1lsrrvqv7anpma4plzs79mqwmw7b2c5d7mn9py8lw"; depends=[htmltools jsonlite yaml]; }; hts = derive2 { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="1.3"; sha256="18vnl0dj6xhdy0bsayfhd2jq51b3ncqxms8r5y263q0ivqyxp2gd"; depends=[deSolve msm]; }; + httk = derive2 { name="httk"; version="1.4"; sha256="1abjb1vg8q4va8g2bfsv537fwrsga83amc9rfsxbdbhzhf2qn0qr"; depends=[deSolve msm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; + httpcache = derive2 { name="httpcache"; version="0.1.2"; sha256="1xphdicgw3zli6naprvn09vh8a0jpsg3nhlwhpwji00p222rnjc4"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.1.0"; sha256="08x3jnvra833kp625bys04b5np9rrlhqf5gp127df80c289vabwx"; depends=[]; }; httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; }; httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; }; - httr = derive2 { name="httr"; version="1.0.0"; sha256="1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"; depends=[curl digest jsonlite mime R6 stringr]; }; + httr = derive2 { name="httr"; version="1.1.0"; sha256="08sq34pknsfcy8lm06nydi12mbaxpqpgb025ahr33v9d3g0wvh6p"; depends=[curl jsonlite mime openssl R6]; }; huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; humaniformat = derive2 { name="humaniformat"; version="0.5.0"; sha256="18094zlvhd44vg2rg4731f84imrjp69gzay3gnm5yp1scbiqbd82"; depends=[Rcpp]; }; + humarray = derive2 { name="humarray"; version="1.0.0"; sha256="1zza4q8cwcvpy1fgw89zchq7hccdy56phyab2f8x8vsph0gr7kc9"; depends=[BiocGenerics BiocInstaller biomaRt GenomeInfoDb GenomicFeatures GenomicRanges genoset IRanges NCmisc Rcpp reader rtracklayer S4Vectors]; }; + hunspell = derive2 { name="hunspell"; version="1.2"; sha256="0yibb9ic9kkl2h0vwwim0qanhsm0c6xck48i3r158agrqzc49s5x"; depends=[Rcpp]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwriterPlus = derive2 { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; }; @@ -4561,12 +4784,13 @@ in with self; { hydroTSM = derive2 { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.4"; sha256="16h9gchfrppn5n77bld8b5lhwk45dncfwxxibrmb6m6iclqiadgy"; depends=[]; }; - hyfo = derive2 { name="hyfo"; version="1.3.4"; sha256="1p949rr3ihrzz7l88vzaqsllx1rmjxdksdnsgv494zd5ym1jkyhb"; depends=[ggplot2 lmom maps maptools MASS moments ncdf plyr reshape2 rgdal rgeos zoo]; }; + hyfo = derive2 { name="hyfo"; version="1.3.6"; sha256="0d8dhp15h3ajvivb6fq8q83l7nz25a2lc7zx9cwlq6vrkj8ww3ya"; depends=[ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyperSpec = derive2 { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[ggplot2 lattice latticeExtra mvtnorm svUnit]; }; hyperdirichlet = derive2 { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[abind aylmer cubature mvtnorm]; }; hypergea = derive2 { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-11"; sha256="0kg7yimgrrcqdzxackslf2zxpdrl3xx3a88irkxlwhf36znwfrdj"; depends=[contfrac deSolve elliptic]; }; hypervolume = derive2 { name="hypervolume"; version="1.4.1"; sha256="0gx9ing4h1sg4zzppfa386hllryf8vk1n013yv14c0k3sjjnz456"; depends=[fastcluster geometry ks MASS Rcpp RcppArmadillo rgl]; }; + hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hysteresis = derive2 { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; @@ -4574,42 +4798,47 @@ in with self; { iBUGS = derive2 { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; }; iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; }; - iClick = derive2 { name="iClick"; version="1.1"; sha256="0xyc2v7qx887g3x08sk5kyd5zsg89hgqn4srr68w9d0fpgmwxzx6"; depends=[fBasics forecast rugarch timeSeries]; }; + iClick = derive2 { name="iClick"; version="1.2"; sha256="04d82wbddvj73cw6ys492nasvxcj8m5594zf9r41y72i5yha11pa"; depends=[fBasics forecast lattice lubridate openair rugarch timeDate timeSeries]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; }; - iGasso = derive2 { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[CompQuadForm lattice]; }; + iGasso = derive2 { name="iGasso"; version="1.3"; sha256="17j29jj767wy5zhgbnznlj0jb4azzrl0qdijc11bpwb7apkmyvz8"; depends=[CompQuadForm lattice]; }; iLaplace = derive2 { name="iLaplace"; version="1.0.0"; sha256="1fwsfx3y44k8xsp1l1n51vqa767ahvk462plgkljdcq4nxa0idvc"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; - iNEXT = derive2 { name="iNEXT"; version="2.0.5"; sha256="1n9qyddjrpsas930wdi7yx91a8hhilvbkhjiaqpjzwdx8big3f7l"; depends=[ggplot2]; }; + iRafNet = derive2 { name="iRafNet"; version="0.1-1"; sha256="1lcrsii4cmbih67wwvndnbbm023n001qy1phg6k76zsm9sizd7a1"; depends=[]; }; iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; }; iRegression = derive2 { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; }; + iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; - iaQCA = derive2 { name="iaQCA"; version="0.8.7.0"; sha256="1dvd1bgai9izfiljmbi8kzfskpy78xcg3jyjsknqyb7a4q7il6fv"; depends=[bootstrap QCA]; }; ibd = derive2 { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; }; ibmdbR = derive2 { name="ibmdbR"; version="1.47.1"; sha256="0xxhx0dbz9y4lhnwb0ic14dny0md59izicn12nbsv8040v56kwky"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; }; - ibr = derive2 { name="ibr"; version="2.0-0"; sha256="033mc4w8vfqdjfs2qml1qhysqzhfsnkr4q66dii33611py1caq7y"; depends=[mgcv]; }; + ibr = derive2 { name="ibr"; version="2.0-2"; sha256="1v4jn1izdc0cvm0yhr0anz2zjz66i25rg9039327kw8yrx8a34wx"; depends=[mgcv]; }; ic_infer = derive2 { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; }; ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; + icRSF = derive2 { name="icRSF"; version="1.0"; sha256="155lgak9jqsy398q5y4fl050gas5hppb25jhc1njglq2h98w3pl2"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; }; icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; icamix = derive2 { name="icamix"; version="1.0.4"; sha256="17yag996m8gn4vfr6a8gcsrancdhjla5bm7fi23p1ln8i4hdz5v5"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; + icarus = derive2 { name="icarus"; version="0.2.0"; sha256="1qj0g4inl76128rjhn6g4w499y1yy75yvq31c408jz6akv8p2921"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; }; icd9 = derive2 { name="icd9"; version="1.3"; sha256="1k34s7zys2c6v6i7843yh8i5bh3j7axdv9xdlampdfx5pn5g29as"; depends=[checkmate fastmatch Rcpp]; }; - icenReg = derive2 { name="icenReg"; version="1.3.1"; sha256="0r7rzfkjrhbkpz463id91mvk0y2vsxjnypm7pl14xs4mjxkpp434"; depends=[foreach MLEcens survival]; }; + icenReg = derive2 { name="icenReg"; version="1.3.4"; sha256="0s3amjz8vz4y256wj85dg01vxhsyy1njgrsrw3l35z7ka9hxmcdf"; depends=[foreach MLEcens RcppEigen survival]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; + idbr = derive2 { name="idbr"; version="0.1.2"; sha256="1j9qjh5121aaasqd05qi0gw3cglfq355cq8wg23k3m3jcfm7ihh9"; depends=[dplyr httr jsonlite]; }; idendr0 = derive2 { name="idendr0"; version="1.5.2"; sha256="18fblymbdl1i0sxfv911ls090hkhmwlk0q1dx4fhi54h16qqzjhf"; depends=[tkrplot]; }; identifyr = derive2 { name="identifyr"; version="0.1"; sha256="011i6s7w7ss6vlyhwdj67hw4pwyvnn3vga89d3ykd3j3h1k615zp"; depends=[magrittr stringr]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; - idm = derive2 { name="idm"; version="1.2"; sha256="0f9w1556yfn3vsza6g5lmcpaydj20k0zdlc9shciskkiqhm9gjlc"; depends=[animation ca corpcor dummies ggplot2]; }; + idm = derive2 { name="idm"; version="1.3.1"; sha256="1mysvkdkzwdggb081zbjb9bm8jxdygd4q3w50js1x26pr69kvzni"; depends=[animation ca corpcor dummies ggplot2]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; + iemisc = derive2 { name="iemisc"; version="0.5.0"; sha256="1xy6nyk5bw9lx9bhfk5l2k3lp9b46anzamfbvhd3cgv94xh03vv2"; depends=[data_table pracma zoo]; }; + iemiscdata = derive2 { name="iemiscdata"; version="0.5.0"; sha256="0xvv5yva2swmr7nziik838wznk30j2j032s6m71xrvdbngr4cpnd"; depends=[]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; ifaTools = derive2 { name="ifaTools"; version="0.8"; sha256="1nmim5dw42wkzjw85g5raz899xa2whlyvz36jcpli69cx0zq3kqq"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; }; @@ -4618,28 +4847,28 @@ in with self; { ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igraph = derive2 { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; + igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; }; - ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; + ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast survival]; }; imPois = derive2 { name="imPois"; version="0.0.7.5"; sha256="15l2air707xnzxvgvzsv90m5pl8vvr9inywvmx7f7irn4syy0g3a"; depends=[geometry rgl]; }; - imager = derive2 { name="imager"; version="0.14"; sha256="1zfy5iz5l2f6yjzhi5wgb2xsngnlxslc186iacvspmw0zydzwyvw"; depends=[jpeg magrittr plyr png Rcpp stringr]; }; - imguR = derive2 { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[httr jpeg png RCurl]; }; - immer = derive2 { name="immer"; version="0.2-0"; sha256="15a3qr4lgp8gykr72jj3gpvlf0npcp7071a7d8q3ns13lfk5m9r3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; }; + imager = derive2 { name="imager"; version="0.15"; sha256="0np23g1p097iv9qwbbrk69v2v025f91b30jaqh3621csv7hll095"; depends=[jpeg magrittr plyr png Rcpp stringr]; }; + imguR = derive2 { name="imguR"; version="1.0.1"; sha256="1pabgp1s3gkirxh5a95lmnrzgfdh04s9r63y9v9x43hmqg77jkw3"; depends=[httr jpeg png]; }; + immer = derive2 { name="immer"; version="0.4-0"; sha256="0g757149rmq5v1hwmd2q5fafz09dz5mcg29v5cx4n3p719xzpp8w"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; }; import = derive2 { name="import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; imputeMissings = derive2 { name="imputeMissings"; version="0.0.1"; sha256="1xcgv725xs1vqg5b6psbmsgh7xikb8iasd9n7f8dxrlq3d1p5khv"; depends=[randomForest]; }; - imputeR = derive2 { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; }; imputeTS = derive2 { name="imputeTS"; version="0.4"; sha256="0prd7wcbikyzzfphqmrhxwgrpvpd129m3hvr217xmclr4gqrknsb"; depends=[stinepack]; }; imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-2"; sha256="10ngxv4zsh78gm3xwb22m681nhl2qbnzi4fkqwgjj2iz46ychzvy"; depends=[extRemes]; }; inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; }; inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; - inbreedR = derive2 { name="inbreedR"; version="0.3.0"; sha256="02a8fflpx3149p9d7dsf1k9zbxghrg36zr8yr4d2hvxzpd93m2dj"; depends=[data_table Hmisc scales]; }; + inbreedR = derive2 { name="inbreedR"; version="0.3.1"; sha256="1a5iz5hkwa32nrc205ybjzm6nijr6b38ipyvcivsdz4maz3rlmhf"; depends=[data_table]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; }; - inegiR = derive2 { name="inegiR"; version="1.0.2"; sha256="1j7fpz96rn89lr5gckprcbzdi8jdvpjhs4xbyj3ipiv1rdj0lyda"; depends=[jsonlite plyr XML zoo]; }; + inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; inferference = derive2 { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; }; @@ -4651,15 +4880,16 @@ in with self; { informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; - infuser = derive2 { name="infuser"; version="0.2.1"; sha256="02h3b07zf2x93yyrspb47kjb0jn0i5c79xjvrhm7yj5zzjhzqxh0"; depends=[]; }; + infuser = derive2 { name="infuser"; version="0.2.2"; sha256="0hpy8s0090d7khkqlb733fa55n2g41fcx19dsjpazlk1j7bqrvxk"; depends=[]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; + inpdfr = derive2 { name="inpdfr"; version="0.1.2"; sha256="0bsfyfpxps59nfyx21lh9n15gc1szikjmlqq5mvwnvwd61fly058"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; instaR = derive2 { name="instaR"; version="0.2.2"; sha256="13p6j24c8yw3rqjac2q1s6s765bg8022wkhlbqh543lf7zx92rm0"; depends=[httr rjson]; }; - install_load = derive2 { name="install.load"; version="1.0.3"; sha256="0fvync9v712r4l6053bncl8a0rgjq0nfnrnpc0yxc2m3mxf5hzvr"; depends=[]; }; + install_load = derive2 { name="install.load"; version="1.0.4"; sha256="18il5134halv8j5p6hks04i97aam3gcwgbss5yj1hmpf71dhqr4p"; depends=[]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; intReg = derive2 { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; }; @@ -4668,11 +4898,12 @@ in with self; { intcox = derive2 { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; interactionTest = derive2 { name="interactionTest"; version="1.0"; sha256="1ppc476glwf0bsr1wgzircvnhgn9kkbhy3rskfz671ma6fv3p67b"; depends=[]; }; + intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; - internetarchive = derive2 { name="internetarchive"; version="0.1.4"; sha256="0889y0w3avh2c2imcxhvjli8619g7pqd6nakwxdgqlsdg6mxlif2"; depends=[dplyr httr jsonlite]; }; - interplot = derive2 { name="interplot"; version="0.1.1.0"; sha256="1japwjwv45dcbi3g8fs00bzj1gqdpcpdg7mld5af1pz33xdxfxbd"; depends=[abind arm ggplot2]; }; - interpretR = derive2 { name="interpretR"; version="0.2.3"; sha256="1y2j91dm0p6yy9qwkllmlmk8n2b9ics4d40cmq8b0fk3rk61vh59"; depends=[AUC randomForest]; }; + internetarchive = derive2 { name="internetarchive"; version="0.1.5"; sha256="0zaf7nzdjr0wlvzrb6wr2nr42nq7l113i2zv9d7220wp75a5cwvd"; depends=[dplyr httr]; }; + interplot = derive2 { name="interplot"; version="0.1.2.0"; sha256="1m9zh028j9nr5by26qw5bihwxj7ys39xqk82fwwkd37yqfxybsnc"; depends=[abind arm ggplot2]; }; + interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; @@ -4685,16 +4916,17 @@ in with self; { io = derive2 { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; }; ioncopy = derive2 { name="ioncopy"; version="1.0"; sha256="1idk899zxvpvnswdwlpkhy5v8id6xmrbp6hg4rmrlpp3wfxw3ad5"; depends=[multtest]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; + ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; iosmooth = derive2 { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; }; iotools = derive2 { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; - ipdw = derive2 { name="ipdw"; version="0.2-3"; sha256="1l1wgxdfk9mw58i6h7b4dgi4aw2z9n5gzhb0yhzmrxgz2xb3rn7x"; depends=[gdistance raster sp]; }; + ipdw = derive2 { name="ipdw"; version="0.2-4"; sha256="0dlj8bfgqjf6yam11c74yhz1yj553a15sf1wgqdvf9912jpi3j54"; depends=[gdistance raster sp]; }; ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; }; - ipfp = derive2 { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; }; + ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; }; ipred = derive2 { name="ipred"; version="0.9-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; }; ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; - iptools = derive2 { name="iptools"; version="0.2.1"; sha256="1754i1pqs18x2as2vlfn6vi6j7q4s6n25k2bizv8h83bc316cjp2"; depends=[BH Rcpp]; }; + iptools = derive2 { name="iptools"; version="0.3.0"; sha256="03i3n3v75vdlfk1z4pq6256pmb907mm60hl2gzhf7dyjvfzrm9p0"; depends=[AsioHeaders BH Rcpp]; }; ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; }; iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; }; irace = derive2 { name="irace"; version="1.07"; sha256="187lwi19qcq2kqxca0233qs6k36n9fsnnh9xqwjga15snn4vlrlq"; depends=[]; }; @@ -4714,15 +4946,16 @@ in with self; { isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; isva = derive2 { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; }; + itcSegment = derive2 { name="itcSegment"; version="0.1"; sha256="1x6hxr55d7ny9mmm4zhadnx5rvli8nwbh9cjqlzl1lpa7w5sfiri"; depends=[maptools raster rgeos sp]; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; iterLap = derive2 { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; }; iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; }; - iterpc = derive2 { name="iterpc"; version="0.2.7"; sha256="041gihbcv9i7f1jzvlldkyfm58p86pyv2sf4hbk09xp00azp8ahf"; depends=[polynom Rcpp]; }; + iterpc = derive2 { name="iterpc"; version="0.2.8"; sha256="096x2q8bx95ilyq5zpkqgzpfyrbj0j4fwvdivc4zf3ybd2fm4fjp"; depends=[iterators polynom Rcpp]; }; itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; its = derive2 { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; }; - itsadug = derive2 { name="itsadug"; version="1.0.1"; sha256="0vazyg5pqvp9iidkhbm33l0g1sb8q3f6mig03ss8biia0hg2qb5i"; depends=[mgcv]; }; + itsadug = derive2 { name="itsadug"; version="2.0"; sha256="0s77f060xb2lkddd116snpvsbs73wz8kwv4hkd6yv0m2fpamvpvx"; depends=[mgcv]; }; itsmr = derive2 { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; @@ -4732,35 +4965,39 @@ in with self; { ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; - jaatha = derive2 { name="jaatha"; version="3.0.0"; sha256="0l6amkcg8j7vpf7cv4rvp50163879rbqanp512yz80c0gyzcdm88"; depends=[assertthat R6]; }; + jaatha = derive2 { name="jaatha"; version="3.1.1"; sha256="017iysn4g196q36b9d7dw19hahvh2ngv872nmx36a84rxs3ymnav"; depends=[assertthat R6]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstraw = derive2 { name="jackstraw"; version="1.1"; sha256="0p79b8vgjspi3hjqqrhrfvf0k9rzg7ycn7azax3pk28j2cvi30j2"; depends=[corpcor lfa]; }; - jagsUI = derive2 { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; }; + jagsUI = derive2 { name="jagsUI"; version="1.4.2"; sha256="0c8sg3zc40imircnkk5f8wbvqb2jz5li87m3wxcdr8djcs7yasx8"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; - jetset = derive2 { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi]; }; - jiebaR = derive2 { name="jiebaR"; version="0.7"; sha256="1pia3dv20fcw83rxmfr194h7nbnvrjsvxvcln3gr7ds2kzp97xjl"; depends=[jiebaRD Rcpp]; }; + jetset = derive2 { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi org_Hs_eg_db]; }; + jiebaR = derive2 { name="jiebaR"; version="0.8"; sha256="1qf27lrz02w94vxqjqbp94xxi38jzhjblcg4c1n82ngpzmfb44qc"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; jmcm = derive2 { name="jmcm"; version="0.1.1.0"; sha256="1mijj7c5n48jkka162rd2297gq8lijhrwg6r5wd1b7dq5r1ahgby"; depends=[Formula Rcpp RcppArmadillo]; }; jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.0.2"; sha256="0m3zz0xr2f6y8igwcg8a3rbyl3a6m8viyp0pcjbdwyj2400dbf3m"; depends=[Rcpp RcppArmadillo]; }; + jmuOutlier = derive2 { name="jmuOutlier"; version="1.1"; sha256="17mg2aa2mn25448yky647xrvm3dmsjhl751j8ywcd8af2wf8vyrn"; depends=[]; }; joineR = derive2 { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[boot gdata lattice MASS nlme statmod survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="2.3"; sha256="0rsnngfik3h7s3q431rbhz5r5md0sp5786626117nxqjm32jz7by"; depends=[]; }; + joint_Cox = derive2 { name="joint.Cox"; version="2.4"; sha256="18r1h9spcjg6yc37nqralf6ac04hgvfhqfviv8ldc7fl5nw8ws5q"; depends=[]; }; jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; - jomo = derive2 { name="jomo"; version="1.3-0"; sha256="00pxgyq9mhnl9rlb1y35d707va26vs1clv0s89z07bhm0ll4na3l"; depends=[]; }; + jomo = derive2 { name="jomo"; version="2.1-1"; sha256="1wxisjskjnm0y48amn0zwb1ih7jvbjcfihs7az1vvgmlz2y2vc7n"; depends=[]; }; jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; + jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; }; js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; }; jsonlite = derive2 { name="jsonlite"; version="0.9.19"; sha256="1hbdraj3xv2l2gs9f205j8z054ycy0bfdvwdhvpa9qlji588sz7g"; depends=[]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jug = derive2 { name="jug"; version="0.1.1"; sha256="0dv6v8nxrbvlyhchzjq0m4x5v88ayrrw5xgrphx865ywsxllrb85"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 stringi]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; - kSamples = derive2 { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; }; + kSamples = derive2 { name="kSamples"; version="1.2-3"; sha256="0pb32pdh23qm1svfayk50bv75mbz50rc62013sdx1h9zmrcz5f37"; depends=[SuppDists]; }; + kantorovich = derive2 { name="kantorovich"; version="1.1.0"; sha256="06c1w6wqhlsx30lyy4126llbvaalppsibwwikw2dn316898vslg4"; depends=[gmp rcdd]; }; kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; }; kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; }; + karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; - kdecopula = derive2 { name="kdecopula"; version="0.4.1"; sha256="0ajbpgnfh8pf599vk05gnkfs0jbgqfkasrslf9cydcd8spb0zc7b"; depends=[cubature lattice locfit qrng Rcpp RcppArmadillo VineCopula]; }; + kdecopula = derive2 { name="kdecopula"; version="0.5.0"; sha256="1cwd81fhjzdzmsn9mnj71bzqf1s5hwlaq4sijww0d81i6nwcafjl"; depends=[cubature lattice locfit qrng Rcpp RcppArmadillo VineCopula]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; }; keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; }; @@ -4768,19 +5005,18 @@ in with self; { kequate = derive2 { name="kequate"; version="1.5.0"; sha256="0yalh3j5kcz3zxk1afny7v22n7y5xzbifqifrr1sjm8czi8hdi01"; depends=[equateIRT ltm mirt]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; }; - kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="1.0.0"; sha256="11nhjzr8n6ym98wfyn4l0pq71q1ylg4i93whd8pzbzniqgnjm2df"; depends=[DiceKriging glmnet globalOptTests lhs mvtnorm Rcpp RcppEigen]; }; + kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="1.0.1"; sha256="03viwv4fsdby10pqimhgfjv8l654gvggrw4xxikc81w2iyachar8"; depends=[DiceKriging glmnet globalOptTests lhs mvtnorm Rcpp RcppEigen]; }; kerndwd = derive2 { name="kerndwd"; version="1.1.2"; sha256="1d55qrayay3d5p7lxj50mv1yj3l1xh10i3j937lmjn83ffhdq40a"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; - kernlab = derive2 { name="kernlab"; version="0.9-22"; sha256="1k0f8kwc3rncdfccqfs42670lkxx53vrcal0jk3nybsyl37jza8x"; depends=[]; }; + kernlab = derive2 { name="kernlab"; version="0.9-23"; sha256="01y1vy1798wspg5qczvgr1k2fmp8pv2y9h8x5kqf0pp73qba9lpg"; depends=[]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.1"; sha256="0ms5zvb3shhhzry2aab749dyiklj8bf55mzlkvsy1as8f7mpf6ar"; depends=[matpow sna]; }; keypress = derive2 { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; }; kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; }; - kimisc = derive2 { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; }; + kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; }; kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; }; kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; }; - kintone = derive2 { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; }; kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; }; kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; kknn = derive2 { name="kknn"; version="1.3.0"; sha256="17lg3dy5b4vs7g6d83ai9chz94sm6bla9rk42gzyqlf9n341cji4"; depends=[igraph Matrix]; }; @@ -4792,19 +5028,20 @@ in with self; { kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[mitools survival]; }; - kml = derive2 { name="kml"; version="2.4"; sha256="0v732jjlk8sy4mbpwad5x8gs9sbw4hwxhnjh4z2glqhpn5g78xl0"; depends=[clv longitudinalData]; }; - kml3d = derive2 { name="kml3d"; version="2.4"; sha256="115av1yhnpfmv1na2b9zvrv42anwrd08i7pscd7ww10grfv435dc"; depends=[clv kml longitudinalData misc3d rgl]; }; + kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; + kml3d = derive2 { name="kml3d"; version="2.4.1"; sha256="1xp95fm7ncmf5mpcc9zkqf6h89g4a7qdgc2snrsy16znsjmncssq"; depends=[clv kml longitudinalData misc3d rgl]; }; + kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; }; kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.7"; sha256="0sx7sxrmm9x01sh3bcp9qqpvljfss9f1hr6h4dcfns8x6f60s5v6"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.11"; sha256="1ikjla0hnpjfkdbydqhhqypc0aiizbi4nyn8c694sdk9ca4jasdd"; depends=[digest evaluate formatR highr markdown stringr yaml]; }; + knitr = derive2 { name="knitr"; version="1.12.3"; sha256="1v3rzv6wq8mvpdrljsaqk4z3f8323jnv385js24wmn4fglqly6dz"; depends=[digest evaluate formatR highr markdown stringr yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.0"; sha256="0pshn2slzqwpryklslsxwh1dmqcnwv6bwi7yfm6m342wjybpk0wl"; depends=[knitr markdown rmarkdown]; }; knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; }; - koRpus = derive2 { name="koRpus"; version="0.05-6"; sha256="00mvdk9akicvy61bx83iyfzaamwpsjk0w7xg6yg26581dbc7wif1"; depends=[]; }; + koRpus = derive2 { name="koRpus"; version="0.06-4"; sha256="16pc52a63zyn68hfgqb9yim5wcmmyd8w1qfhg5skcf1v4lvs8yjl"; depends=[]; }; kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; }; kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; }; kohonen = derive2 { name="kohonen"; version="2.0.19"; sha256="0fi94m2gpknzk31q3mjkplrq9qwac8bjc8hdlb3zxvz6rabbhxrr"; depends=[class MASS]; }; @@ -4813,7 +5050,7 @@ in with self; { kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive2 { name="krm"; version="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.10.0"; sha256="0gxcpcmmraag19z3czb4rhan561hmmmpj9lg3nda1w88wkb5pzn0"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; }; + ks = derive2 { name="ks"; version="1.10.2"; sha256="0fjnnwlf60hdipw0aqbi0w6szhg4dswdim9fbfq56wkj68ax4003"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; }; kst = derive2 { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; }; @@ -4822,23 +5059,24 @@ in with self; { kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; }; kyotil = derive2 { name="kyotil"; version="2015.11-13"; sha256="0q1xw1dhs02d6fjf6vjns15b1y11h34g4m7scsyvp9dch260bljf"; depends=[]; }; - kza = derive2 { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; }; + kza = derive2 { name="kza"; version="3.2.0"; sha256="0h2ri3cvg2x0xd7z4nmxf9f5yiaznfrripmv4h4jhs719xbmlcxk"; depends=[]; }; kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; laGP = derive2 { name="laGP"; version="1.2-1"; sha256="0b614bl87kyfd19a3gznmlgzf9v3mwscxrylgc0s08s0mg6411p8"; depends=[tgp]; }; - labdsv = derive2 { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[cluster MASS mgcv rgl]; }; - label_switching = derive2 { name="label.switching"; version="1.4"; sha256="1b498l3zb05yywkx8lbd9q9h92md2n4kyjvq62903k1wqp65nhvj"; depends=[combinat lpSolve]; }; + labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; }; + label_switching = derive2 { name="label.switching"; version="1.5"; sha256="0hkz5ncmkp4687xz24bk4ypmvp65lahaf23b07jwis2i7wvmldg2"; depends=[combinat lpSolve]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; labeltodendro = derive2 { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; }; labstatR = derive2 { name="labstatR"; version="1.0.8"; sha256="1qs76vhw6ihsriq5v0s980fxbb0pbvgwqm0a97b226cpqqabkpfm"; depends=[]; }; + labstats = derive2 { name="labstats"; version="1.0"; sha256="1cij8dibbmixbg3mf87rdypypl1rsy5wlgfsyhg7l8zg1i2gql1z"; depends=[]; }; laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lakemorpho = derive2 { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[geosphere maptools raster rgdal rgeos sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; - lamW = derive2 { name="lamW"; version="1.0.0"; sha256="1lxh5pjq6g6msrw2r6c97g4fh1gkyakijnxqmr6nwq9rjbf3d21w"; depends=[Rcpp]; }; + lamW = derive2 { name="lamW"; version="1.1.0"; sha256="0kxp16riyj4gvzigx1dg3hl1jjd9w6d9mzbsf67wqdcml38wn4c6"; depends=[Rcpp]; }; lambda_r = derive2 { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; }; lambda_tools = derive2 { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; @@ -4853,29 +5091,30 @@ in with self; { lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; }; - latdiag = derive2 { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; }; + latdiag = derive2 { name="latdiag"; version="0.2-2"; sha256="1893xcwpvpv3d3pnkzxjqgbbn9cw8gqg9pbg8vaas39785jq29sp"; depends=[]; }; latentnet = derive2 { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; }; latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; }; lattice = derive2 { name="lattice"; version="0.20-33"; sha256="0car12x5vl9k180i9pc86lq3cvwqakdpqn3lgdf98k9n2h52cilg"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; }; - latticeExtra = derive2 { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; }; + latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; }; lava = derive2 { name="lava"; version="1.4.1"; sha256="1xwyfn31nr8sppxy25a7p8yhf5isq4ah0dd45plhfclnlwrycr1l"; depends=[numDeriv]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; lavaan = derive2 { name="lavaan"; version="0.5-20"; sha256="0vkgx0qg1xw6z89rb0lqc42pbiid4n7zhwa3zn61x9hn16y7avza"; depends=[MASS mnormt pbivnorm quadprog]; }; + lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.0"; sha256="0g8snpfnz7r9ckjhjaggdh1rbxrzvm63qkrx1zp30x7i32f52bzd"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3"; sha256="1rjh0dk2rphn3aphnghpls0sckch889p5nddpwqqbqmbbzcvfgpi"; depends=[lavaan MASS survey]; }; - lawn = derive2 { name="lawn"; version="0.1.4"; sha256="1qhwi40fpwdhn5zf7ggmqyqapd762zx6ipnzmbasjmxryvyjmh81"; depends=[jsonlite magrittr V8]; }; + lawn = derive2 { name="lawn"; version="0.1.6"; sha256="1v1f6jpz5zwfhvpwjyyqlm57rfxd38hg6bq9h2aayx2lgq5spfam"; depends=[jsonlite magrittr V8]; }; lawstat = derive2 { name="lawstat"; version="3.0"; sha256="0398bf4jv0gnq54v6m7zl5sixspnvfwc3x3z492i38l215pc38kx"; depends=[Hmisc Kendall mvtnorm VGAM]; }; lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; }; - lazyWeave = derive2 { name="lazyWeave"; version="3.0.0"; sha256="1ic05ph55krmzg34fx1gnp1l0198chj0lpm8pnaml36ng7ashwd9"; depends=[Hmisc]; }; + lazyWeave = derive2 { name="lazyWeave"; version="3.0.1"; sha256="02c3z479y6xxng2x6vp6m0rvf3jsb9n26h00l93djxads8717i1x"; depends=[Hmisc]; }; lazyeval = derive2 { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; }; + lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; lba = derive2 { name="lba"; version="1.2"; sha256="0zfln5dc4v3yaqgdbg22nq3z2by7jnbbi9mwwwvkr4j1z70knpqg"; depends=[alabama ca MASS plotrix]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; - lcd = derive2 { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[ggm igraph MASS]; }; lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; - lcmm = derive2 { name="lcmm"; version="1.7.4"; sha256="0cy2kmkyi85vkl20x1qssadpgixhfrsawqkhhfjfyxzcx7ja4wic"; depends=[survival]; }; + lcmm = derive2 { name="lcmm"; version="1.7.5"; sha256="0xw411vhrh7l72wwc114rm0qiaxzl2gi8sm32qy9i8mry4623cj2"; depends=[survival]; }; lcopula = derive2 { name="lcopula"; version="0.205"; sha256="0ni8q5cdzrkcjxjj1z6kyzd0sp592vnrh3yxnwh2vl9wc41v59i9"; depends=[copula pcaPP Rcpp]; }; lctools = derive2 { name="lctools"; version="0.2-4"; sha256="0sfb26j0mgnnzql2ylj2d3cll67j7axyr1n20sv3zgx7nblkzkjj"; depends=[MASS pscl reshape weights]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; @@ -4885,7 +5124,7 @@ in with self; { ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; - leaflet = derive2 { name="leaflet"; version="1.0.0"; sha256="1s49nk1wzcdim3cqv4lq4kpvny1hvcnm1sbman9f5h8zgbi7f93n"; depends=[base64enc htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp]; }; + leaflet = derive2 { name="leaflet"; version="1.0.1"; sha256="1hwv3aay1pl48kzd8wz073jbfky47d9lr1xv0iawnv31r488wnpj"; depends=[base64enc htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp]; }; leafletR = derive2 { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; }; leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; }; leaps = derive2 { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; }; @@ -4894,29 +5133,32 @@ in with self; { learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.4"; sha256="0r7zjnhy95cb9dwqy0zldny8sra1gbmwmskbkdjkcvlvxdxk5c4w"; depends=[ellipse foreign leaps MBESS readxl sas7bdat triangle]; }; + lessR = derive2 { name="lessR"; version="3.4.4"; sha256="1z59hhf4g9dv9pyk51166v26lfrih2rb4xh46zwa4jdxg0scmarm"; depends=[ellipse foreign leaps MBESS readxl sas7bdat triangle]; }; lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="2.4"; sha256="12jazq54rn1mxh7ff7hd88mqwn0n85dn0mhdbli81sr4kdnd37sl"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; - lfactors = derive2 { name="lfactors"; version="0.5.3"; sha256="0bj67rk7z4is84qd08h1x3b7mna3n5l9qbgpi6gzpppqxc3jd64a"; depends=[]; }; - lfda = derive2 { name="lfda"; version="1.1.0"; sha256="09a4ccrdcfiv390qkwllkj192lbziv4sb437v2lbh39yn10fi48z"; depends=[plyr rARPACK rgl]; }; + lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; }; + lfactors = derive2 { name="lfactors"; version="0.7.0"; sha256="0kcn8l3k33q43mpgp862p3vfh2j58mdp3bixryyys76hhqfghqsw"; depends=[]; }; + lfda = derive2 { name="lfda"; version="1.1.1"; sha256="1af4yl1k0p1wr3zar0syyjk0bc0nkng01afp5vchh7h5bb7nza8k"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.4-1788"; sha256="1f4b8s7n40j23hab4jn6crrwagwj68vb7c31k68i748zwwnf0xjc"; depends=[Formula Matrix sandwich xtable]; }; lfl = derive2 { name="lfl"; version="1.2"; sha256="0l922sjpdiy4ifhizl1l2azzwg83j8fy8j5bvwx6yd3fvxas51ns"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfstat = derive2 { name="lfstat"; version="0.8.0"; sha256="00vjkn5q4k3bqd1xfvi2s15csc126v4x0y1iiipdvs9pqwy9hc63"; depends=[dygraphs lattice latticeExtra lmom lmomRFA xts zoo]; }; lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; - lgcp = derive2 { name="lgcp"; version="1.3-13"; sha256="0f3vjad9hh7gzvcrps2jvfrj96xj2dw3cx9yvp9ynifpqhy7cy4v"; depends=[fields iterators maptools Matrix ncdf RandomFields raster rgeos rpanel sp spatstat]; }; + lgcp = derive2 { name="lgcp"; version="1.3-14"; sha256="1n9nmxgyzw6f27lx47bfz3cp62yxhdx07dh8b3wlf7b2nyx8jgjz"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; - lhs = derive2 { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; + lhs = derive2 { name="lhs"; version="0.13"; sha256="1wi21iyzsr6z3ina2iplqzymg9rspr6im0aik4gmh9qdbw1lj258"; depends=[]; }; libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.1.10"; sha256="1j1m5s8bsxl21rjy3jy12babd69kkd1c4awpi14wh09w45d3pvfr"; depends=[markovchain Rcpp]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; liftr = derive2 { name="liftr"; version="0.3"; sha256="0piy10syyli14xd71ynlxxsdfhs7i531kymvw2psz0ridv7ang1j"; depends=[knitr rmarkdown stringr yaml]; }; - likeLTD = derive2 { name="likeLTD"; version="6.0.1"; sha256="019p69gy4nxqcpvr7z1ffk9dpjmqfpmfc58slbcwp58qwd89yvh5"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; + lightsout = derive2 { name="lightsout"; version="0.2.1"; sha256="12249kjfmrybwq7s3biai0f2pcv30556a4w9q63drm4aqpc6v5q8"; depends=[magrittr shiny shinyjs]; }; + likeLTD = derive2 { name="likeLTD"; version="6.0.4"; sha256="1czwcr5d8i1xwll92m4302fjm76w6ss9b0ndpjm5vwk1492h285a"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; }; likert = derive2 { name="likert"; version="1.3.3"; sha256="0vdm0ggki9lyxm7b477v1ja23d73p7iys3as98vjwymgkakrbb8b"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; limSolve = derive2 { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[lpSolve MASS quadprog]; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; + linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; linbin = derive2 { name="linbin"; version="0.1.1"; sha256="0i99j7n1hxvnm2605b2xr4mxpib64abr10wp03nxii16nssvv66m"; depends=[]; }; lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; }; @@ -4925,8 +5167,9 @@ in with self; { linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; lint = derive2 { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[dostats foreach harvestr plyr stringr]; }; + lintools = derive2 { name="lintools"; version="0.1.1.1"; sha256="1rsya48abvr5zijd10bh5g03hjviyack2gh0waawqhv29lhiy9f1"; depends=[]; }; lintr = derive2 { name="lintr"; version="0.3.3"; sha256="04h05y678xx65sd3cx23yzkdmghk47ikg52w4ii110jjq0s53p9d"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; }; - lira = derive2 { name="lira"; version="1.0"; sha256="1272897phwhan8ns7x65m8g333rv43nfypl253rsklah5dh2invg"; depends=[coda rjags]; }; + lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; }; liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; }; lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; @@ -4934,34 +5177,35 @@ in with self; { listWithDefaults = derive2 { name="listWithDefaults"; version="1.0.0"; sha256="1l7q5v7nf2z1six66lvqflnc77q0f7n1acdbmla695myv246aj6d"; depends=[assertthat]; }; listenv = derive2 { name="listenv"; version="0.6.0"; sha256="0kyq90mf7wv9qgw3s81iv0b8ah0ncc5kv15r7fv6ggdq4f0z0dx7"; depends=[]; }; littler = derive2 { name="littler"; version="0.3.0"; sha256="1n3kmfl4kazab0yxwgdri24179w6pbkx96pgn8j3alj6ixrn5wdy"; depends=[]; }; + livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; }; lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; - lm_br = derive2 { name="lm.br"; version="2.7"; sha256="09b9f6c7gkkmznypr74f4fdhkkdw7fzpa9gdyx2cl7pj6sg4fvjy"; depends=[Rcpp]; }; - lmSupport = derive2 { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 pbkrtest psych]; }; - lme4 = derive2 { name="lme4"; version="1.1-10"; sha256="18bk4syjpyq38fwy3px65m5n065gkbycq4yqnmrasp72nq8p0dv8"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lm_br = derive2 { name="lm.br"; version="2.8"; sha256="019j0ypl4cdnl29r9x17m62jnpp1p174zmy3zdy8bvp52kz4008r"; depends=[Rcpp]; }; + lmSupport = derive2 { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 psych]; }; + lme4 = derive2 { name="lme4"; version="1.1-11"; sha256="1ji3nkw46ryr8gsam5fbwfbc0pf9s224yfzrs11yb91i89jza93r"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive2 { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmenssp = derive2 { name="lmenssp"; version="1.1"; sha256="1s0v5fmzmiq271d3x8l83ni7rl7ikw40mqwhhd2xh21a3nrcdw6l"; depends=[geoR MASS mvtnorm nlme]; }; - lmerTest = derive2 { name="lmerTest"; version="2.0-29"; sha256="01xx4ddy5qgw4ipj4yvqawz33wg71crw02m6kdg75lh7mizq60fm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; }; + lmerTest = derive2 { name="lmerTest"; version="2.0-30"; sha256="16kxk8wiad5w5x81jlr2v6422b5wyi2ay4bkl8s2vq3szrbxl3k9"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; }; lmm = derive2 { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; lmmot = derive2 { name="lmmot"; version="0.1.3"; sha256="1wpqcyscbqv9l8kl4lg5xg6cs3vc496jwpyj5y4iqmks88hgi6il"; depends=[MASS maxLik]; }; - lmms = derive2 { name="lmms"; version="1.3"; sha256="1qmyblvifz7ix04lga6sgpyzyjrf59sxkiyanixmp1zmf50i6ng7"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; }; + lmms = derive2 { name="lmms"; version="1.3.3"; sha256="1gralhk9plmpmdya7cfzgzwzr8ab47pz4f76kvlp03sp5gcy4063"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; }; lmodel2 = derive2 { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; lmom = derive2 { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; }; lmomRFA = derive2 { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; }; + lmomco = derive2 { name="lmomco"; version="2.2.2"; sha256="1ha77bvd7gb6150mkah62v2vgazifj8as19ry4ivm0kdzlbxc0jz"; depends=[Lmoments MASS]; }; lmtest = derive2 { name="lmtest"; version="0.9-34"; sha256="0bhdfwrrwjkmlw0wwx7rh6lhdjp68p7db5zfzginnv3dxmksvvl6"; depends=[zoo]; }; - loa = derive2 { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RColorBrewer RgoogleMaps]; }; + loa = derive2 { name="loa"; version="0.2.38"; sha256="1k57n3j8nh0frgabhb5gh0scmgp5gzn2zc9l206mklbw06jkdp96"; depends=[lattice MASS mgcv png RColorBrewer RgoogleMaps]; }; localdepth = derive2 { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; - localgauss = derive2 { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[foreach ggplot2 MASS matrixStats]; }; + localgauss = derive2 { name="localgauss"; version="0.35"; sha256="1b8zx2kv1yyazw1sq0c91q11mk3pc7ig2q93qm6lv75nlakyp7da"; depends=[foreach ggplot2 MASS matrixStats]; }; localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; @@ -4977,29 +5221,29 @@ in with self; { logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; logistf = derive2 { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mgcv mice]; }; - logisticPCA = derive2 { name="logisticPCA"; version="0.1"; sha256="01a7vrvdab2r4z2y1r41mfma58alcdpbizhwmra941yxi0rc1r7r"; depends=[ggplot2]; }; + logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive2 { name="logmult"; version="0.6.2"; sha256="0i6sabg56x52aw5n7i61ick4n0hsbs28iagyzp0nvd2qrvz8p9ma"; depends=[gnm qvcalc]; }; - logspline = derive2 { name="logspline"; version="2.1.8"; sha256="1y0vdrvk8bmqm4rpfr90cdw0y4sk8xgr73g1nwbcjffz10m7qmz4"; depends=[]; }; + logmult = derive2 { name="logmult"; version="0.6.3"; sha256="05vxvi9zf2araxfng7gibak9g8m6vwmp7aclddpd814lxzmsmf8a"; depends=[gnm qvcalc]; }; + logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; }; lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; longCatEDA = derive2 { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; }; longclust = derive2 { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; - longitudinalData = derive2 { name="longitudinalData"; version="2.4"; sha256="16k58i9wyizv052l2rza72qk2zgn199hy1krv567cny732s5n9x4"; depends=[class clv misc3d rgl]; }; + longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive2 { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; }; longurl = derive2 { name="longurl"; version="0.1.1"; sha256="06xyxn641nsw3zl2mllsvm1r4g82ddnc3vvscp6bdw8l7a13w4a5"; depends=[dplyr httr pbapply]; }; - loo = derive2 { name="loo"; version="0.1.4"; sha256="1gjn2l5wyz92r7rsa63fh6xw55vs64l1lpjwsg1rhg4cq10mqrwn"; depends=[matrixStats]; }; + loo = derive2 { name="loo"; version="0.1.5"; sha256="0d5lnc8a9939g3mvh28ymvsabgfkq9fqljskvqj5v9rb4ps1b9xd"; depends=[matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; - lordif = derive2 { name="lordif"; version="0.3-2"; sha256="1nvb2kv0b7h4nz90wpijc0458mgxzdjzxn3w5x92bq174rg3r51m"; depends=[mirt rms]; }; + lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; }; lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; }; - lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; }; + lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; @@ -5007,24 +5251,25 @@ in with self; { lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; }; lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; - lqmm = derive2 { name="lqmm"; version="1.5.2"; sha256="155nqxbc78kls5y5f1890v30djsm2agb2k5i6znn6a61z6a5mn07"; depends=[nlme SparseGrid]; }; + lqmm = derive2 { name="lqmm"; version="1.5.3"; sha256="1gl609irhxk7qi4x8as2xylc6iybm9jyrnm7dvb92nxl0ksp44v7"; depends=[nlme SparseGrid]; }; lqr = derive2 { name="lqr"; version="1.1"; sha256="1ljxvq6vbqzb8p6krv0k2d4fjv7y0l7m5dvbzw6rg82zfa66mlhk"; depends=[ghyp spatstat]; }; + lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; }; lrgs = derive2 { name="lrgs"; version="0.4.2"; sha256="04blq49sxc0shny0yfv19az66k8xb8bwdqznqajzr3cbsnpvh5bk"; depends=[mvtnorm]; }; lrmest = derive2 { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; }; - lsbclust = derive2 { name="lsbclust"; version="1.0.3"; sha256="09f43vc1cv9xgf6csc01rlnac62wq0d3q7b1qrbjm5a4g9spknkn"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; }; + lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; }; lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsei = derive2 { name="lsei"; version="1.1-1"; sha256="1akvkccf2cq331agcsi24x3cw73cc8vdl7kw3zjyg8q6lmvq78am"; depends=[]; }; lsgl = derive2 { name="lsgl"; version="1.2.0"; sha256="18dmm6slf0ilikz9hr3j8p554h5w9jaypfdmva7d2s0mhlv6nx5y"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.1"; sha256="0y6lqmjiah33j66hxwxx9b6qx42sv0bqqgic39nkil1zppkk3b4h"; depends=[ggplot2 reshape2]; }; - lsmeans = derive2 { name="lsmeans"; version="2.21-1"; sha256="0g6ypk2krg2hia6wsdk6ixz7cknb3fdric7ssqdrb2dlv9lv5ivq"; depends=[coda estimability multcomp mvtnorm nlme plyr]; }; + lsmeans = derive2 { name="lsmeans"; version="2.23"; sha256="0f3i2415nd6s80lcw0cbksz2g360ws6yvvc0c3rw47z95zi599fj"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive2 { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive2 { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; - ltmle = derive2 { name="ltmle"; version="0.9-6"; sha256="0q65ha7j3q9myhsafcmjwyxjf486xw4c3d17gpdnsvq4zqgfsy16"; depends=[Matrix]; }; + ltmle = derive2 { name="ltmle"; version="0.9-7"; sha256="18nybicfy7sp4rvnyckd9wgsb4hqsgmwijh2id9d6kyvkcinxaw2"; depends=[Matrix]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.4"; sha256="1p026ryq31iw7d8mbi4m2q43g5frj47387w8g46j50bcv11hh2zm"; depends=[fields gstat sp]; }; @@ -5035,9 +5280,9 @@ in with self; { lulcc = derive2 { name="lulcc"; version="1.0.1"; sha256="1xq4rjsds9vwj4prkjxfcp9sv53ha9pj65ns0frpbh8grvrjwimv"; depends=[lattice raster rasterVis ROCR]; }; lumendb = derive2 { name="lumendb"; version="0.2.0"; sha256="0j0bcg0nrp6ckd2vr81jqx9k8q6fsnfpi3n1c5nyjasspb746q2i"; depends=[httr]; }; lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; - luzlogr = derive2 { name="luzlogr"; version="0.1.1"; sha256="14fk5d3fwyzg1ba0k24cmbcmdg13qf6m0rghpsgrzy7478pn3jjr"; depends=[assertthat]; }; + luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; }; - lxb = derive2 { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; }; + lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; }; mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; @@ -5050,11 +5295,11 @@ in with self; { mRm = derive2 { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; }; maGUI = derive2 { name="maGUI"; version="1.0"; sha256="0vlaxdq2fw9bpz4wd4ir4gy6pas0hp01xlkbnvwrv297zzhndrr6"; depends=[affy annotate beadarray Biobase BiocInstaller Biostrings convert genefilter GEOmetadb GEOquery globaltest GOstats graph gWidgets gWidgetsRGtk2 impute limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; }; maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; - maSAE = derive2 { name="maSAE"; version="0.1-3"; sha256="1im837kdmpgk1073iqgqz194b1i005i88w7wl50hdgw07hizlk18"; depends=[]; }; + maSAE = derive2 { name="maSAE"; version="0.1-4"; sha256="0287x5n41hl6p2s9f62zmjq87dklfyvb41fd9q3s1m2sjspgd6vc"; depends=[]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; mada = derive2 { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; - madness = derive2 { name="madness"; version="0.1.0"; sha256="1pdh5wz61w2vb0cbxjhzs3nqhnyfz78ni8cz5hnabx27nx11dwbq"; depends=[expm matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.0"; sha256="02swq1hzmsdcfjhlmjykd81cyygxfx4add9caj2q2z6xhmfh3rlv"; depends=[expm matrixcalc]; }; mads = derive2 { name="mads"; version="0.1.3"; sha256="1nq17r9k2wg9v5nis0c0z4qf5pcmw93smxf7lra7vsiqgzgzhaad"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; magclass = derive2 { name="magclass"; version="3.74"; sha256="0ikhh50k4i9d4h36yq0ccps4smqr0igrgxzfy23rg57dwcfzz3yz"; depends=[abind maptools ncdf4 reshape2 sp]; }; @@ -5067,17 +5312,17 @@ in with self; { mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mangoTraining = derive2 { name="mangoTraining"; version="1.0-6"; sha256="1g5qwc09whrsxlp2wvgx79p5mrjw5jj0q0k1bv08pq31djr7c3r3"; depends=[]; }; - manifestoR = derive2 { name="manifestoR"; version="1.1-1"; sha256="1g5p7zimj64hfcfkqxap4xhqicz8k5jg9x5ag4inq30qz3cqypf8"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; }; + manifestoR = derive2 { name="manifestoR"; version="1.2"; sha256="069nfhafqaqb4amkc40bcqc0qij1nl9h433l97q4vxq55aqr2hz0"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; - mapDK = derive2 { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; - mapdata = derive2 { name="mapdata"; version="2.2-5"; sha256="0pl4k7lxmyg96h2i8mwdqgwq5ff1v08g54dig5zmqn9wi71y6nl9"; depends=[maps]; }; + mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapmisc = derive2 { name="mapmisc"; version="1.4.6"; sha256="00v7jwjvw942xr1bd05n8i3abbzbcnbjzpm3mxb2sh32s4w1hifj"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive2 { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; }; - maps = derive2 { name="maps"; version="3.0.1"; sha256="0i0w209zqfk7vppdz5m96ypl9drg1irg96w2vqg5snnqb48682p0"; depends=[]; }; - maptools = derive2 { name="maptools"; version="0.8-37"; sha256="08vhd4af5955p44x1g0csnz090nhmac8sajyjcwqink0x05fbg1f"; depends=[foreign lattice sp]; }; + mapr = derive2 { name="mapr"; version="0.2.0"; sha256="1lfi6hrbifp4mfxnqn4qbnicjfnrg9pc73kdrk7hf3dfhgi5269n"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; }; + maps = derive2 { name="maps"; version="3.1.0"; sha256="16hsw1vzkxm0rhfsryj1zsiywxaa5hn5dbyxvnb42grqgl6wrdkn"; depends=[]; }; + maptools = derive2 { name="maptools"; version="0.8-39"; sha256="1lkxlvk8h9v37cl87r39asm4mhyihllv105izgh7bfsxwh9y70ab"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; mapview = derive2 { name="mapview"; version="1.0.0"; sha256="1kk3slizi78qjnfwnv8jjhwb6x89w7ly11l7fxk4fny3zjzj1spa"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet OpenStreetMap png raster rasterVis Rcpp rgdal satellite scales sp]; }; @@ -5085,35 +5330,37 @@ in with self; { marelac = derive2 { name="marelac"; version="2.1.5"; sha256="1lzgcl6y4dmy3radzr49smy0cwdbd930dvah9rs50x637yqc7p14"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; markdown = derive2 { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; }; - marked = derive2 { name="marked"; version="1.1.10"; sha256="0a5b3nx7fwk0lavjpdlr9c1hm0zl215b2f2mi6kx00irys6h9nyh"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx R2admb Rcpp truncnorm]; }; - markmyassignment = derive2 { name="markmyassignment"; version="0.3.0"; sha256="1s35hkvmc4l4fm96jm0m2vzd7lbkiqb75gb6zwck58v1k6qckw2v"; depends=[codetools httr testthat yaml]; }; + marked = derive2 { name="marked"; version="1.1.11"; sha256="12wh8djc0j7x4ywn7x57f93wyl05p6yv7808g6s5pn2v5j0v66q6"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp truncnorm]; }; + markmyassignment = derive2 { name="markmyassignment"; version="0.5.0"; sha256="17xw5hn0bg1w7vbs8d8kr6y0drrmkmpwfvr6dy3zndagzsb2sdw0"; depends=[codetools httr testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.4"; sha256="12np5rg59wjyh1mfhhfh115ziciba973fjvbrhn4qzdnry1mwbdb"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.4.3"; sha256="0xzadlpznkclx7s0y8hpd9yf3ck578w913yljfg6fh7m9avzgvmw"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.4.3.1"; sha256="0ik8wkg8cj6z5ys3lm15jkslsxq2j2ahzw2nc7q0qrvgzbmfck6w"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive2 { name="marmap"; version="0.9.5"; sha256="0avdi55b43nrkryygs7g3l62g48m1b2zhjf7xcwx7q166k7lb7ax"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; }; - matchingMarkets = derive2 { name="matchingMarkets"; version="0.1-7"; sha256="01mr22ybrrmq7xcx6612lqwkf60wc3sfygxshpm2gnd8nrlgqjbv"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; }; + matchingMarkets = derive2 { name="matchingMarkets"; version="0.2-1"; sha256="14y1sigmi3rv8rpvcyc2d7j4dlzr85mhsqrgdjfszxz26rahkx6k"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; }; matchingR = derive2 { name="matchingR"; version="1.2.1"; sha256="09vx3yqaq0pq341v8rm2hjxx0aza0bnh9iffrygwbhls7fi7kn7y"; depends=[Rcpp RcppArmadillo]; }; + matconv = derive2 { name="matconv"; version="0.3.0"; sha256="19b03ks2pqsz7wk3wm7iaj5z5aidsd6hn0s0x46r2iv13x67fjkd"; depends=[]; }; + mateable = derive2 { name="mateable"; version="0.3.0"; sha256="0jbdfijf9iq5ik5pri0iricip9hglp75jask65iyf1k8n82hippb"; depends=[FNN Rcpp sn]; }; mathgraph = derive2 { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.1"; sha256="0h9h805569dxnrrzgmxmhvmx7l8kg53lq1nksdrr7p9f8jglha6s"; depends=[stringr]; }; - matlib = derive2 { name="matlib"; version="0.6.0"; sha256="08gcnyk988bncikr58j75v0a6gaag0ld1q5ykysi9zxa61gzfha9"; depends=[rgl]; }; + matlib = derive2 { name="matlib"; version="0.7.2"; sha256="1832i9c9cp2klblwf6wbpigpzsnlli912dzkabjp5zlzkngbfym5"; depends=[rgl]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; matrixStats = derive2 { name="matrixStats"; version="0.50.1"; sha256="08l32abp7dfnsc49ca4hzznh934y60n5z01x5ga2ixky5961s57c"; depends=[]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; - matrixpls = derive2 { name="matrixpls"; version="0.6.0"; sha256="0ym9c6r66v3pswji8p2dbsq4dzbdv8xfrg6j9p8zbq5pd0kn8kqg"; depends=[assertive lavaan MASS matrixcalc psych]; }; + matrixpls = derive2 { name="matrixpls"; version="0.7.0"; sha256="1bzgw5lghi3q9qgjcs87w2b0slvxy4cppr9p378p44hqzf00na4h"; depends=[assertive lavaan MASS matrixcalc psych]; }; maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; }; maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; }; maxlike = derive2 { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; maxstat = derive2 { name="maxstat"; version="0.7-23"; sha256="1dp2gp0zsf3l5vd43ixxx7039ybcw84x9zf526pk1p2j7pxwsbay"; depends=[exactRankTests mvtnorm]; }; - mbbefd = derive2 { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp]; }; - mbest = derive2 { name="mbest"; version="0.4"; sha256="1fnwkrckw8lrhpzs8hdcxswvpfd4n30rfhcpnvg671sfvybnjnqy"; depends=[lme4]; }; + mbbefd = derive2 { name="mbbefd"; version="0.8-0"; sha256="1vpbclkbfw8cas4474sbmnnvab3vrqivmgby95prm40p3xdy9xl4"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; + mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; }; mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; - mboost = derive2 { name="mboost"; version="2.5-0"; sha256="0l9vbzfwpxh2pi815pnb2xskxwfrbfhmq1bqkgmnvmphq0qv73ql"; depends=[lattice Matrix nnls quadprog stabs survival]; }; - mc2d = derive2 { name="mc2d"; version="0.1-15"; sha256="1kp2l1gvw3caplq9916s1dmpmfp6fb2xscys9gj6dykl6gi4h4hb"; depends=[mvtnorm]; }; + mboost = derive2 { name="mboost"; version="2.6-0"; sha256="0ldg293nv4i8541w4il7hrw9hqgdk4q204dvrbmsrdb8i9cpm3s5"; depends=[lattice Matrix nnls party quadprog stabs survival]; }; + mc2d = derive2 { name="mc2d"; version="0.1-16"; sha256="0pw89pqmwlavb2bhhshv68fzf6s16a3rwj52prylv9clr07rw7pa"; depends=[mvtnorm]; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcIRT = derive2 { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; @@ -5134,28 +5381,30 @@ in with self; { mcprofile = derive2 { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; }; mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; + md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; mda = derive2 { name="mda"; version="0.4-8"; sha256="1vb98zi0narqh2bwnjm33jnfzvgnaf1chh263xkgkpjb3ph0lvpd"; depends=[class]; }; mdatools = derive2 { name="mdatools"; version="0.7.0"; sha256="0b010nmldafb5ibm0wzn4hxsyhwkx5f0g79mbcfh8lsq9zprq9am"; depends=[]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; + mdhglm = derive2 { name="mdhglm"; version="1.2"; sha256="0k7y5j03i49m791m99vy0cal9w5nc38w18j1zq1zqdccpcndz9pj"; depends=[boot Matrix mvtnorm numDeriv]; }; mdscore = derive2 { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; }; - mdsdt = derive2 { name="mdsdt"; version="1.1"; sha256="1c0fsj5hg1l1yh8a1fhvmmlfnhbxwmpqx19qr1mk80r52hz9dnlq"; depends=[ellipse mnormt polycor]; }; + mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; measuRing = derive2 { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; }; meboot = derive2 { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; }; medSTC = derive2 { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medflex = derive2 { name="medflex"; version="0.6-0"; sha256="1qwjs418i2wxmszgax4l859ihk2avlxwm5w0a772zi6gj0kqwk3d"; depends=[boot car Matrix multcomp sandwich]; }; mediation = derive2 { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; - medicalrisk = derive2 { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[hash plyr reshape2]; }; - mefa = derive2 { name="mefa"; version="3.2-6"; sha256="0ag17v81birsi47h2fsnz9bm07qr9xfvbxfy1jj044v7fxnl27jx"; depends=[]; }; - mefa4 = derive2 { name="mefa4"; version="0.3-2"; sha256="0j5xx72f3q79j8z0c9vhcakxgdly7g2px7657jhg71w95pdwg2ql"; depends=[Matrix]; }; + medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; + mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; + mefa4 = derive2 { name="mefa4"; version="0.3-3"; sha256="1bb5m6hqs79jbs51crl8h73lwvfqnj99jqgagb0whpxg9yviffrn"; depends=[Matrix pbapply]; }; megaptera = derive2 { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[ape ips RPostgreSQL seqinr snowfall XML]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mem = derive2 { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[boot sm]; }; memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.97"; sha256="069siqkw7ll9n1crsl3yjhybwz0w52576q504cylpvlxx3jm9hfs"; depends=[lattice MASS]; }; - memoise = derive2 { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; }; + memisc = derive2 { name="memisc"; version="0.99.6"; sha256="0pjcg0z4m1kr12cj1x1lm8snjldb2f1xp2sx0v6k7c1xdzmsxnmc"; depends=[lattice MASS]; }; + memoise = derive2 { name="memoise"; version="1.0.0"; sha256="0sq2dhpvxy17v1baj256r0jnygdy3m5a8x4zh6vhv29957qnq6zx"; depends=[digest]; }; memuse = derive2 { name="memuse"; version="2.5"; sha256="1a34803k41644yw1h3msywslsfjvnxi5c9yjw0b73znzy76wh6wv"; depends=[]; }; - merTools = derive2 { name="merTools"; version="0.1.0"; sha256="0dxvbmgjirc29qmn4c305idacm09pim88j7aajh14535wpd7by6c"; depends=[abind arm DT ggplot2 lme4 mvtnorm plyr shiny]; }; + merTools = derive2 { name="merTools"; version="0.2.0"; sha256="146rskqzvmkvra5kvnfmn8r0g1jbbw16w9hxgzpa91xvq3bwz6qa"; depends=[abind arm blme broom DT ggplot2 lme4 mvtnorm plyr shiny]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; metRology = derive2 { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; }; meta = derive2 { name="meta"; version="4.3-2"; sha256="0970snzclh83rz446m1r2bkfiylxx444z6bp7ah6lka488wmyck6"; depends=[]; }; @@ -5176,23 +5425,23 @@ in with self; { metaheur = derive2 { name="metaheur"; version="0.1.0"; sha256="0bdvfa6y6w8ybdnr0h414bzikkrdp4g5mrcsprzhxwim96j8imh6"; depends=[ggplot2 preprocomb reshape2]; }; metamisc = derive2 { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; }; metansue = derive2 { name="metansue"; version="1.0"; sha256="1vcyvvysfz9frdy35g3p2hvndcdd4dk7kccwsgwzl7sl6ag73596"; depends=[]; }; - metap = derive2 { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; }; - metaplus = derive2 { name="metaplus"; version="0.7-5"; sha256="1a9603p2inxm46zhdldak0634x9g40fr7faanlfj5g888y1i3xh7"; depends=[bbmle boot lme4 MASS metafor numDeriv]; }; - metasens = derive2 { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; }; + metap = derive2 { name="metap"; version="0.6-2"; sha256="1j0k3pxr7qsmn4ldnl650nqv0si6l67gm4shx9mpswgsbpg3wkx4"; depends=[]; }; + metaplus = derive2 { name="metaplus"; version="0.7-6"; sha256="15rngr7ckrykdzad46vanpmgsid14q574357i02pq8rqylk4s4h5"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; + metasens = derive2 { name="metasens"; version="0.3-0"; sha256="1j955p5i116ggvd6nk0dp6r8qc0nh7v1iv48vaz7dds4m951lzyv"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; - meteR = derive2 { name="meteR"; version="1.0"; sha256="1xmp7p47xsn1y41ij6yzywmwpp6inj9dzzhhlr2i1p6fra1bcy90"; depends=[distr nleqslv]; }; + meteR = derive2 { name="meteR"; version="1.1"; sha256="0b41a6v7w3n06dyz81v5zhh1ncqx3lascdl5lrwbdjxypcdjv0cf"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.49"; sha256="0h3qb7srfmv4bl207arz6x3q64bh5pb0pc49lgrnplcjwwxk78bs"; depends=[raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; mets = derive2 { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; - mev = derive2 { name="mev"; version="1.3"; sha256="02f0fi3iaykcrh1k2hwnqk9aqrlvyddjjkkyq62b1fxp1agzrfxi"; depends=[Rcpp RcppArmadillo]; }; + mev = derive2 { name="mev"; version="1.6.1"; sha256="09n6vhga6h4k3iqwxrbr9ba2jh8rwnydsnrgq61iwndz0bqd24ig"; depends=[evd ismev Rcpp RcppArmadillo]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; }; - mgcv = derive2 { name="mgcv"; version="1.8-10"; sha256="10spvqjp95czrdd5skp9isgrad56nxgmigyly7nsmwzvhrgbs2x1"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-12"; sha256="1khzy36nn6xbnzqfc2953ng0sv8w91mns1ymhibaqn1150x1qid0"; depends=[Matrix nlme]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.1-2"; sha256="1hwni8g37n3jp2cvkg9a49n7rkhjsm8wb89xkzzjj93m6sa643nf"; depends=[glmnet matrixcalc Rcpp]; }; + mgm = derive2 { name="mgm"; version="1.1-4"; sha256="02m1ihi9m9x9m0jqwgp67k9f9lnq76cskx77wxzy69nbl1d91xh7"; depends=[glmnet matrixcalc Rcpp]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; }; mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; }; @@ -5200,6 +5449,7 @@ in with self; { mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; }; mhurdle = derive2 { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula maxLik pbivnorm truncreg]; }; mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; }; + miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; }; micEcon = derive2 { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; }; @@ -5207,41 +5457,46 @@ in with self; { micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; }; micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; mice = derive2 { name="mice"; version="2.25"; sha256="1c6xjvqy3w5lqbs4k22vb3x3an4ss22zpp2zigwhnm1y9mphg06x"; depends=[lattice MASS nnet Rcpp rpart survival]; }; - miceadds = derive2 { name="miceadds"; version="1.5-0"; sha256="1jxmcs3g4pdqvdjys3zl7fnpkx5hnhjg6y6yhd6i5hkhkmysqvgm"; depends=[bayesm car foreign grouped inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; }; + miceadds = derive2 { name="miceadds"; version="1.7-8"; sha256="0f7vh96q9xp9v5hbb15bvm3825kl51zz582rd98d4kgd7nk4896a"; depends=[bayesm car foreign grouped Hmisc inline lme4 MASS MBESS MCMCglmm mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; }; + microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; }; micromap = derive2 { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; }; micropan = derive2 { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; }; midasr = derive2 { name="midasr"; version="0.5"; sha256="1w3rxsxkcjy30sjxv4cxvqzfw7k278s6mrrjm4pbz7cydbiws2vp"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; }; - midrangeMCP = derive2 { name="midrangeMCP"; version="1.0"; sha256="0c1rl3k0jsgcc56fipgyjy12sdi2gx2xkbi6s00rs5n3crh2vxmq"; depends=[SMR WriteXLS xtable]; }; + midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; + midrangeMCP = derive2 { name="midrangeMCP"; version="1.1"; sha256="0ripx7ydvbs3b5g6k2q7nnmrzq9i1wfa6whc536q5wimfd0gzlkg"; depends=[SMR WriteXLS xtable]; }; migest = derive2 { name="migest"; version="1.7.1"; sha256="0xxca4ww13ml4pvdc688pp7vikwgyp8mz5czw896mh37z8lhdvvj"; depends=[]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; mime = derive2 { name="mime"; version="0.4"; sha256="145cdcg252w2zsq67dmvmsqka60msfp7agymlxs3gl3ihgiwg46p"; depends=[]; }; minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; }; - minerva = derive2 { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; }; + minerva = derive2 { name="minerva"; version="1.4.5"; sha256="0k6hyfh1lr345718vl1ssqgm5567nylk158awygmbjgkv8g8v2av"; depends=[]; }; miniCRAN = derive2 { name="miniCRAN"; version="0.2.4"; sha256="1p8kypq0r4sckvdq7qfznfjp3mpjy3cvm9dnwpdfn4dnl4n377z0"; depends=[httr XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; + miniUI = derive2 { name="miniUI"; version="0.1.1"; sha256="1qfca55phw6614qh5ligvqawpyvpb08x7ky44sffwxgff4h074lw"; depends=[htmltools shiny]; }; + minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; }; minpack_lm = derive2 { name="minpack.lm"; version="1.2-0"; sha256="0h8grkwkm2w0jl9fl5kma3b6p1n76gm42qbsyrnhr7pwsxx4qwgr"; depends=[]; }; minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; }; minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; }; + minval = derive2 { name="minval"; version="0.2"; sha256="1hjj24vpnva130bfxn8dczhfn30rcgichi25y77rgaw3z58hm39n"; depends=[]; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="2.2.1"; sha256="0i69pbwszwqgc7wyfvnwgbp73dw0vg0pf692wyiwjkqvyfdrqa40"; depends=[cmm numDeriv Rsolnp]; }; - mirt = derive2 { name="mirt"; version="1.14"; sha256="19hij1kq1jspfd1nhksn1b5m396j9qwl7kq8ir1s88h9v43vrzay"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; }; - mirtCAT = derive2 { name="mirtCAT"; version="0.6.1"; sha256="1nfaqg3bifbrbzyrqh38xly20zlnhxk406axzncmv6nyfqw42j9d"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; }; + mirt = derive2 { name="mirt"; version="1.16"; sha256="1lafpm7fizvvyv2f5gyabj1chl0vdf3q0bv77swz2cxjvlznc9aw"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; }; + mirtCAT = derive2 { name="mirtCAT"; version="0.8"; sha256="077pcirvvvqh0fsgna5r4dhqvyfv8hp7bfn6c8cgfi8wgbisa634"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; }; miscFuncs = derive2 { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[mvtnorm roxygen2]; }; miscTools = derive2 { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; }; - miscset = derive2 { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable]; }; + miscset = derive2 { name="miscset"; version="1.0.0"; sha256="0m6gv2w8fj1604wrmcdgz6dpmpkz7j3sppda11klsx0hv1xqr2af"; depends=[ggplot2 gridExtra Rcpp xtable]; }; missDeaths = derive2 { name="missDeaths"; version="1.2"; sha256="0lamxws1qqafz1mqdrzmq6jjn490z8zd63w4mzyb5nwwlxbmy6v8"; depends=[cmprsk mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.9"; sha256="1g8b37cjaya1g5hkqwjgamnh4jfsqw90453yxh3jnvdw7irl4vsm"; depends=[FactoMineR mice mvtnorm]; }; mistat = derive2 { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; }; - mistral = derive2 { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; }; - mitml = derive2 { name="mitml"; version="0.2-4"; sha256="17nhzyw0pnc9xadn7zlxpccfigixaz015fybm79f0mnzkxfif8zf"; depends=[haven pan]; }; + mistral = derive2 { name="mistral"; version="2.0.1"; sha256="037jp2p8h29by5a1gmm6irlsgz72rqi4zfbfjhk1c1gfk2fr3dfb"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; + mitml = derive2 { name="mitml"; version="0.3-0"; sha256="1vk2y48mcvm6f7vr4m8y726ygi8d1zf70jz6yy8i91gzakmsrr4x"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; mix = derive2 { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; }; mixAK = derive2 { name="mixAK"; version="4.2"; sha256="0z96ddlvkpr4y2chi929ik81snsr0f03a0k4cnh0q1lx0lr51p1z"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; @@ -5253,14 +5508,14 @@ in with self; { mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; }; mixer = derive2 { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; mixexp = derive2 { name="mixexp"; version="1.2.3"; sha256="1cywqqiap4czni2jlcfyh6l6sn6v6wb2bzkfavbg2h6f5xc3ljnn"; depends=[daewr gdata lattice]; }; - mixlm = derive2 { name="mixlm"; version="1.1.0"; sha256="16b1zfzcvs1hxcp31gldwi6535srjprfxzzv0qbgvvpvzxjfrsa2"; depends=[car leaps lme4 multcomp pls pracma]; }; + mixlm = derive2 { name="mixlm"; version="1.1.1"; sha256="1ffrkfksli9zwk5cdjc1q7xqvmwbpkxjbzrbpvj1ays9yrhvgkxb"; depends=[car leaps lme4 multcomp pls pracma]; }; mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; }; mixpack = derive2 { name="mixpack"; version="0.3.4"; sha256="0d28yxxm8rcb8l9nzpaviz4gxm690f88d3z21sc3qg02qdh3xqk0"; depends=[mvtnorm Rcpp RcppArmadillo]; }; mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; mixsmsn = derive2 { name="mixsmsn"; version="1.1-1"; sha256="0n2iib0kpnsgz2k761myjqy2zsw0yrygpamxgm90cvngvxvkmkhc"; depends=[mvtnorm]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; - mixtools = derive2 { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; }; + mixtools = derive2 { name="mixtools"; version="1.0.4"; sha256="133rr17ywmlhsc6457hs8qxi8ng443ql9ashxpwc8875gjhv1x32"; depends=[boot MASS segmented]; }; mixtox = derive2 { name="mixtox"; version="1.2"; sha256="0yw3zvgxmrwcnps9zws87z9p4jk8gblr0giwh9298ngpcv4dd3rs"; depends=[nls2]; }; mixture = derive2 { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; }; mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; }; @@ -5271,26 +5526,28 @@ in with self; { mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; }; mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; - mldr = derive2 { name="mldr"; version="0.3.18"; sha256="1023ym182mz830qj5wz5l85pqm1r0y7783ma3n8i74fzf964zqrc"; depends=[circlize shiny XML]; }; - mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.1"; sha256="09ydpsl84g03m6jc4f3pivmdi7hycvp47j77lyg317zj527lx09m"; depends=[]; }; + mldr = derive2 { name="mldr"; version="0.3.22"; sha256="0q5dpqx6zapawjjq8rqk112w5qsk7r6sc90y63yvllk9yhdgygyw"; depends=[circlize shiny XML]; }; + mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.15"; sha256="1xivwmv6hvl026c5ymc23fr36sk797dxn2wa9lp20dgh5s0cq10n"; depends=[]; }; mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; }; mlegp = derive2 { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; }; - mlma = derive2 { name="mlma"; version="1.0-0"; sha256="19vrw67qgd1kyn730v30dn2r9pf35nq4cgsvy31658i3h54l147h"; depends=[lme4]; }; + mlma = derive2 { name="mlma"; version="2.0-0"; sha256="1wkkvbix1sycaxss4hy1y6k8r5wm1s38fbjis07slr8hpkvskmv6"; depends=[lme4]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; - mlr = derive2 { name="mlr"; version="2.7"; sha256="0ik016cgk1kk79pifva64j78gj8vwx3qy4b5kr6vxv44nmc89nfc"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; }; + mlr = derive2 { name="mlr"; version="2.8"; sha256="1826lvnz5z9j7im66m8hg6dzrjipyygylhj0whyrskjsgz98wili"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; + mlt = derive2 { name="mlt"; version="0.0-30"; sha256="0r4xfjlyrixs9mjbgag72qkv7nqf9vq2qy8drdfybwg69d763wap"; depends=[basefun BB numDeriv quadprog sandwich variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="0.0-30"; sha256="1gbidyjq0bdg5mmlx6aivlm1j22ddwlc1q6r7h3pq6ri7yzmmaxw"; depends=[mlt numDeriv]; }; mlxR = derive2 { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 Rcpp XML]; }; - mma = derive2 { name="mma"; version="2.0-1"; sha256="0j387l0413gf6rxkggmph1ms44f629m853n6vshv2x76p3dly3kc"; depends=[gbm]; }; - mmand = derive2 { name="mmand"; version="1.2.0"; sha256="19d35ji8l5gz7q51qq1kg73zyqzk1g3f9czfisj1gbadcgjzs4ys"; depends=[Rcpp RcppArmadillo reportr]; }; + mma = derive2 { name="mma"; version="2.0-4"; sha256="1c8jbgb3nsrfrdbbj85qkabz497qrwvk6ddzxm985hq50kfpbxv0"; depends=[gbm]; }; + mmand = derive2 { name="mmand"; version="1.3.0"; sha256="134fqkdysxdg7r7syv0d3yffvmgdjhm91ywh39i955ldprbh4qbv"; depends=[Rcpp RcppEigen reportr]; }; mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; - mmcm = derive2 { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; }; + mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; }; mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; mme = derive2 { name="mme"; version="0.1-5"; sha256="07k1xagwpyzsrlc00y9xlaxcpwdhz55v567i7fzvqa96ical8nlf"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.2"; sha256="1kcfq5y2fzsrbjyvh6dfp734ly7alj9vrjikzadlz33s7wjanh79"; depends=[]; }; @@ -5299,35 +5556,37 @@ in with self; { mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmod = derive2 { name="mmod"; version="1.3.1"; sha256="1srk46m95kh0y25nw53z671dd7zbmrfnfn7gmhnzxvc6dq0wvshh"; depends=[adegenet pegas]; }; mmpp = derive2 { name="mmpp"; version="0.4"; sha256="120ciyd9c6zwbdvzcpasb1476d0i9h28a1a5c99z3zar8lpp184p"; depends=[]; }; + mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; }; mmtfa = derive2 { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; }; mnlogit = derive2 { name="mnlogit"; version="1.2.4"; sha256="0s7pp3qflnscs0z9fjvnl6rh5j92jnpksqli65gmrqwbqp3md8i8"; depends=[Formula lmtest mlogit]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; - mnormt = derive2 { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; }; + mnormt = derive2 { name="mnormt"; version="1.5-4"; sha256="0dr8lm1yjh5rwfjn8bjpxaklcym7alqda0nwrjmp6pvqf09wmvl8"; depends=[]; }; modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; }; - modQR = derive2 { name="modQR"; version="0.1.0"; sha256="0k9rqwi0amq8cln1a6i58xb19cpkjq0qca4vsgq1r2x1370hf9fq"; depends=[geometry lpSolve]; }; + modQR = derive2 { name="modQR"; version="0.1.1"; sha256="1dc04wrax73f6fzkl6ycsa3wzf5347h79ah3vy3m24f4hjncnffw"; depends=[geometry lpSolve]; }; modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modeest = derive2 { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; modelObj = derive2 { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; + modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; - modules = derive2 { name="modules"; version="0.1.0"; sha256="0hlyc90zzpc2zk05h3gjpaxv903n0gvbbcm7iqna5r1a760p98j1"; depends=[aoos]; }; + modules = derive2 { name="modules"; version="0.3.0"; sha256="0xbkzjs2960p92k0qx7gi7wgiwqvr76bwa75csxghjr79w41yr4q"; depends=[aoos stringr]; }; mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; }; mokken = derive2 { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; }; - molaR = derive2 { name="molaR"; version="0.2"; sha256="0i3rvhc4wzg23kyq804cr3qy2qqf1k901b5ci4jr9xyq0sj2lvjl"; depends=[alphahull geomorph psych rgl]; }; + molaR = derive2 { name="molaR"; version="2.1"; sha256="1425m138vsx42hp8kfa93ac5y0hs7zzb8lr4nmxx9jbbrva11lfp"; depends=[alphahull geomorph psych rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="1.6.1"; sha256="16agh7lclkx3709cll3mgnm4bby8m5sscizblw1m5hjmld4d4mjm"; depends=[actuar mgcv mvtnorm ncvreg survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="0.7"; sha256="1j9w90h9ci0k3x270vl4vxq4h8sgfh79rl17v7nxz8zwa9rsf8ld"; depends=[jsonlite]; }; + mongolite = derive2 { name="mongolite"; version="0.8.1"; sha256="103flzk27vb69m02d7v7xp67yvzprffqmz7kha07vb9wya5xrlrr"; depends=[jsonlite]; }; monitoR = derive2 { name="monitoR"; version="1.0.4"; sha256="1ai99lim84nc14ls2jlfflvqm67bgaqb373k9wah83gpq35wdksc"; depends=[tuneR]; }; monmlp = derive2 { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; }; - monogeneaGM = derive2 { name="monogeneaGM"; version="1.0"; sha256="10rnc3ipnf8j85kfgfssmdd9578mnx74694r5jsrj2yvbvzm67vq"; depends=[ape circular cluster geomorph gplots phytools rgl]; }; + monogeneaGM = derive2 { name="monogeneaGM"; version="1.1"; sha256="0fbz26jx05xmna799s086khy6j8xbvv91vh544npd49isnag1v6v"; depends=[ape circular cluster geomorph gplots phytools rgl]; }; monographaR = derive2 { name="monographaR"; version="1.01"; sha256="1qrgdbwj9y0glhb74l6smhf1g387dq0n3hf06irysxb7a3ypvkki"; depends=[circular maptools png raster rmarkdown sp]; }; - monomvn = derive2 { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[lars MASS pls]; }; + monomvn = derive2 { name="monomvn"; version="1.9-6"; sha256="1iisnwgqkh2svrmzd8r4qh8jm4l664ws795jkp3dgx0dadxjqhj6"; depends=[lars MASS mvtnorm pls quadprog]; }; monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; @@ -5339,13 +5598,15 @@ in with self; { moult = derive2 { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; + mousetrap = derive2 { name="mousetrap"; version="1.0.0"; sha256="1zmgf2adhzrdpmh5hx44z8wyjrkg9s3qjcwh18ljiivn8i7fgs7n"; depends=[diptest ggplot2 pracma psych reshape2 scales]; }; movMF = derive2 { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[clue skmeans slam]; }; - move = derive2 { name="move"; version="1.5.514"; sha256="18rf9d0xxs48l0bk9vvr2sxnm7rcr38cgar0y5xgmh8fdf6dsl65"; depends=[geosphere raster rgdal sp]; }; + move = derive2 { name="move"; version="1.6.541"; sha256="13dil2avb7mf45qxrgwbl56ll0zbz007hz74crjlc045x24b0nlx"; depends=[geosphere httr raster rgdal sp]; }; moveHMM = derive2 { name="moveHMM"; version="1.1"; sha256="05za2lb7s0kvvzm8a85qm3wf0qi3wvs9x5mwir8k5bhj1kav2imp"; depends=[boot CircStats MASS Rcpp RcppArmadillo sp]; }; mp = derive2 { name="mp"; version="0.3.1"; sha256="0hwn0dg0k7nhl0jv680q5z9v46mfknndp5xswyl5chkw4ppmnyf2"; depends=[Rcpp RcppArmadillo]; }; mpMap = derive2 { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.1-20"; sha256="0ipy06fv5apzdhj63cx2s20w0jrz7nmpa6q8wdjflvfwqz4sqxm3"; depends=[glmnet MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.2-1"; sha256="1419grr2baqw0m5fv17pcrxxwbax91savnzrg98b7xrs9cqnq97y"; depends=[doParallel foreach glmnet MASS numDeriv pscl]; }; + mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mph = derive2 { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; }; mplot = derive2 { name="mplot"; version="0.7.7"; sha256="052idykpv2362mmqvf9zcr1s383hjfgigwhhdxn9a4azdf8djzh0"; depends=[bestglm doParallel foreach glmnet googleVis leaps plyr shiny shinydashboard]; }; @@ -5355,6 +5616,8 @@ in with self; { mpoly = derive2 { name="mpoly"; version="1.0.0"; sha256="1y8hx97hxhfsik4sikdlmrp2p05xywjqw1fx77rb1s6j97k3kbnk"; depends=[ggplot2 orthopolynom partitions plyr polynom reshape2 rJava rjson rJython rSymPy stringr]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpt = derive2 { name="mpt"; version="0.5-2"; sha256="16rrcy8hy9fw603pbi9wybnql11w0bxlxi1kxx482khg9fj7lwn0"; depends=[]; }; + mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; }; + mrMLM = derive2 { name="mrMLM"; version="1.1"; sha256="0gcn43vjy4mjchklwpmda1r2pbnga6gadcw3fllv7483jjrk4g80"; depends=[gWidgets gWidgetsRGtk2 qqman RGtk2 RGtk2Extras]; }; mra = derive2 { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; mrds = derive2 { name="mrds"; version="2.1.14"; sha256="0lvr9zqyi45a100w31k228b03plna24rzgamsvfa34inyd8q4y9m"; depends=[mgcv numDeriv optimx Rsolnp]; }; @@ -5372,38 +5635,38 @@ in with self; { msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; }; msir = derive2 { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; }; - msm = derive2 { name="msm"; version="1.6"; sha256="0nmvjjngy25k3861ys65fax7iahbhzdmrkp6928kps2s0wv6nggn"; depends=[expm mvtnorm survival]; }; + msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; + msm = derive2 { name="msm"; version="1.6.1"; sha256="192s01amh5q0z65ik2vsika9x81iqjjqabr3jczm5app0phx9i72"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="0.7"; sha256="0rrxxva71j8gk25hi6hycnyrhrdc0skcaj1bnmh029cqhjl3qma5"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; }; msos = derive2 { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; }; msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; }; - mstate = derive2 { name="mstate"; version="0.2.8"; sha256="0minydz24wfx5vkjnf55pw06dr0s06nwwx1qxll1jh8ima224syj"; depends=[RColorBrewer survival]; }; + mstate = derive2 { name="mstate"; version="0.2.9"; sha256="0yp7dfbp711if1n32hmz56ycn0f1bblhajf0w04mw8yicad7ri7n"; depends=[RColorBrewer survival]; }; + mtconnectR = derive2 { name="mtconnectR"; version="0.2.0"; sha256="0gznqcgm5zrmww3zwb09rgfn3fhzj62a4q8c1jd3833vnlikbalj"; depends=[data_table dplyr plyr stringr XML]; }; mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; }; mtsdi = derive2 { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; muRL = derive2 { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; - multcomp = derive2 { name="multcomp"; version="1.4-1"; sha256="07zvpdiphn9ndvhvblnd2li2a70j8igscd685s5mslbx5rqppv3k"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-4"; sha256="0mrsnppljxrh5myjh41ba0yvr0yq7dlrcm9xk0b4gk4v7m3b50rx"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; }; - multgee = derive2 { name="multgee"; version="1.5.2"; sha256="0mwi1gbs9knavgqwrfcxf8kqshvf86g17cxci5slzgqcf24nccsj"; depends=[gnm VGAM]; }; + multgee = derive2 { name="multgee"; version="1.5.3"; sha256="0m7qgpygsax6f2gakrq19bkxvkl9kn8s4n3wy5lbijx01bay9jg2"; depends=[gnm VGAM]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; - multiDimBio = derive2 { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; }; multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; }; - multic = derive2 { name="multic"; version="0.4.3"; sha256="1824pnwgsvf08hwwkl3b9vmfzky16imbjakgsb7jkhnzqv6d5x9g"; depends=[]; }; + multic = derive2 { name="multic"; version="0.4.3.1"; sha256="16nzvwnh3qjpvzljanzfcz3flvnlir269ss7pic3c6krg6j4m480"; depends=[]; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; multicool = derive2 { name="multicool"; version="0.1-9"; sha256="0afk95ymvz21klxgf51iw6g0k0w65flralqm5nalkdpirrqjbydx"; depends=[Rcpp]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilevel = derive2 { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; - multimark = derive2 { name="multimark"; version="1.3.1"; sha256="0v8iks2wf5rwmy74fvgbig6hx4qhl8ns4g7c0n4xr6izq3q98lhw"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; }; + multimark = derive2 { name="multimark"; version="1.3.2"; sha256="1x2k7nm46mllja8pcf41gws0xfyj27m2fsli5zwk2s2i0c7jwqnj"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multipleNCC = derive2 { name="multipleNCC"; version="1.2"; sha256="12lakxnmcsrrxc52f9p9yrszn7l2iqs6sacf5mz3hpm6h04vlrlp"; depends=[mgcv survival]; }; - multiplex = derive2 { name="multiplex"; version="1.7.1"; sha256="0c8974vkn5nljp5b3h8ylds2266d4khkacn9dvlga1caz203fi4v"; depends=[]; }; multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; }; multisensi = derive2 { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; }; @@ -5413,20 +5676,21 @@ in with self; { multitaper = derive2 { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; }; multivator = derive2 { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; multiwave = derive2 { name="multiwave"; version="1.0"; sha256="1gag8pw12ksinymxig8sa8wvsd4amaqmzm4ngxmfvci0y4kckx0h"; depends=[]; }; - multiway = derive2 { name="multiway"; version="1.0-1"; sha256="15phfbv6b1i2bkg8g6nw6akznx0gj9m4v90cys7m2m05rsrgyb9a"; depends=[]; }; + multiway = derive2 { name="multiway"; version="1.0-2"; sha256="03cj4767xd1918vb4jkp7xk2l4gq340c0kc24h40zq4c3gsxwmbw"; depends=[]; }; multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.2"; sha256="13a8w87wq7jv9y654qvlik01q4v0j0mrina2xmvrzqlm25f2rj3w"; depends=[boot sandwich]; }; multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; }; - munfold = derive2 { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[MASS memisc]; }; - munsell = derive2 { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; + munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; }; + munsell = derive2 { name="munsell"; version="0.4.3"; sha256="0jdxlbjslkzaqgp058da1cgm85qvqi09wpcgpvp4hvwnmy83qz1r"; depends=[colorspace]; }; munsellinterpol = derive2 { name="munsellinterpol"; version="1.0.2"; sha256="1c4m9fhggczy3wk51m8qxiahkic1f1lq3r8b0x0mk34pd5wap48a"; depends=[geometry]; }; + murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.0.6"; sha256="15cy480x3xrwsm3wpcsam24034vd1ga119k4800ga8l70k8gw8cw"; depends=[ape corpcor phytools spam subplex]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; - mvQuad = derive2 { name="mvQuad"; version="1.0-4"; sha256="0iprcx69mppcaa9gz1iklr5gwjbbjr58dj80aa5y175mbb76fbcw"; depends=[data_table rgl]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.2.1"; sha256="1356i74x7gbkjrs1qrk756dbq8flc8khw265yylb3gakhmi6rkpq"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; + mvQuad = derive2 { name="mvQuad"; version="1.0-5"; sha256="0byxp30s5pc7mqwza6x8czqgvqbk2xhb9mq0lmkwhk78y80954jv"; depends=[data_table rgl statmod]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3"; sha256="079iqb4rgh0r0q7hg7fw9wqv8jhfd7789izy8wa9hjilmgq8rbba"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; mvabund = derive2 { name="mvabund"; version="3.11.5"; sha256="1l7icsivywjqmwndqhq0d28wbim68y4y8dkb17pw308n9kn5p7d4"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; @@ -5435,10 +5699,11 @@ in with self; { mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; }; - mvmesh = derive2 { name="mvmesh"; version="1.1"; sha256="0dw2z7yq07sb4j0a5502znigvc6jzwdl6cx4kihw96nkb8y0pka5"; depends=[abind geometry rcdd rgl]; }; + mvmesh = derive2 { name="mvmesh"; version="1.2"; sha256="0461yd21fpgc8ibzg6x7b2lv2zy42wx8w4w6r4h8hgsav68vilzm"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; }; + mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; }; - mvnfast = derive2 { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[BH Rcpp RcppArmadillo]; }; + mvnfast = derive2 { name="mvnfast"; version="0.1.4"; sha256="0bhm1g8wnq389ca75lc6hs2g1xin83smwhc8qwik8gria7r2zymf"; depends=[BH Rcpp RcppArmadillo]; }; mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; }; mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; @@ -5447,12 +5712,12 @@ in with self; { mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; }; - mvtboost = derive2 { name="mvtboost"; version="0.3"; sha256="1k51w1imxx8agbf4pnfmzddv034npapn2wxr4y6kl62nlj548kd4"; depends=[gbm RColorBrewer]; }; + mvtboost = derive2 { name="mvtboost"; version="0.4.1"; sha256="1sxbldbcy3md4bni5lgs8v9sl67hjphlhglzbq4nx48iclvixcq6"; depends=[gbm RColorBrewer]; }; mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; - mvtnorm = derive2 { name="mvtnorm"; version="1.0-3"; sha256="107p5s3vvwfx51r1wsy8214y3ci00dl7l4jymk702w9mxsb3nc7i"; depends=[]; }; + mvtnorm = derive2 { name="mvtnorm"; version="1.0-5"; sha256="1pc1mi2h063gh4a40009xk5j6pf5bm4274i5kycln38dixsry3yh"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; - mwaved = derive2 { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny]; }; + mwaved = derive2 { name="mwaved"; version="1.1.2"; sha256="0z9p4756azl506lg3583a5zrjz0dl55lhmjml1xifnk868gld6xs"; depends=[Rcpp shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; myTAI = derive2 { name="myTAI"; version="0.3.0"; sha256="0j0wdc7p98h14l51f0mgl6k7ns8fb93y12z7mjik4dpakzsanl68"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp reshape2 taxize]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; @@ -5465,7 +5730,7 @@ in with self; { nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; }; nLTT = derive2 { name="nLTT"; version="1.1.1"; sha256="0z3d61s6dfkvjv60qyx2mv5f0w1jg0qh5kb3vch3m2am5rbg9fq3"; depends=[ape coda deSolve]; }; nabor = derive2 { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; }; - nadiv = derive2 { name="nadiv"; version="2.14.1"; sha256="1k94shkcdylaqm2j7yp23nx0c7c6n0a9im3afmfkws2ax6bf2yjf"; depends=[Matrix]; }; + nadiv = derive2 { name="nadiv"; version="2.14.2"; sha256="1w3mvid500jcxj79q3104cb40akchpgdfchwljvabv3q4wlj1kzj"; depends=[Matrix]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; @@ -5475,37 +5740,38 @@ in with self; { nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; }; - nbpMatching = derive2 { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; }; - ncappc = derive2 { name="ncappc"; version="0.2.1.0"; sha256="1mfq655micjlicff10a3a0d3wi0gqkj4d92g1wbmqfsz511p5qgx"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; }; + nbpMatching = derive2 { name="nbpMatching"; version="1.5.0"; sha256="16g45yzia748qhmd4imib33qs8i1b1qy5h6gmlr9rr6dwbnv2fig"; depends=[Hmisc MASS]; }; + ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; - ncdf = derive2 { name="ncdf"; version="1.6.9"; sha256="1l0a1q2qym19070d4j31f95ak2xz8wg0mw5kxyzg93rsvhmjbnsq"; depends=[]; }; ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; }; ncdf4 = derive2 { name="ncdf4"; version="1.15"; sha256="0kad69py4nhlsl4xmsfdisx0kzcjch91c0m786h80v3w67s9i0nm"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; }; ncf = derive2 { name="ncf"; version="1.1-6"; sha256="1c0ia6lv36lvqsl16s0a450adkab366k28bcdhff3g31i04xh8mk"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; - ncvreg = derive2 { name="ncvreg"; version="3.5-0"; sha256="0r5k4ny72vd59kfz5dlqcznpir03fbzjly7ikqid9zpmw1vkhz9v"; depends=[]; }; + ncvreg = derive2 { name="ncvreg"; version="3.5-1"; sha256="0dmg8kskihy71j0di4xy2q17bxhyl5803fm6lmsnayziz6fpis6d"; depends=[]; }; ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; }; - ndtv = derive2 { name="ndtv"; version="0.8.0"; sha256="04z9nnhygadhszrlmkbnqr7ql7nkqlawn19qgq0y605ipq7ngr67"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; + ndtv = derive2 { name="ndtv"; version="0.9.0"; sha256="1b35xladdldy801w05d9n40k8vnrzai4a3jywhkbmg448n2q8xy8"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; needs = derive2 { name="needs"; version="0.0.2"; sha256="1w24jxkm456by9fm5wmdxv8gspd78p95jar9b22x1r9jry4nfmhk"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-3"; sha256="19xlw3l90gwan0p40r0s2xy0yv8id32h1i56496spgi02vh3pnsl"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; - neotoma = derive2 { name="neotoma"; version="1.4.0"; sha256="1zdjrlm81q7p373xp017g8qvc0i9wk1md4fjbgga11l92svjm50k"; depends=[plyr RCurl reshape2 RJSONIO]; }; + neotoma = derive2 { name="neotoma"; version="1.5.0"; sha256="13xc9sp25diw8y0fsasgl6aq34fzv4xlnrdfg4dch9zr3dnwc92h"; depends=[httr jsonlite plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; }; netClass = derive2 { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; }; netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; }; - netgen = derive2 { name="netgen"; version="1.2"; sha256="18rr2wx0yjfayf6vjyhc73byxvx65wrkyjczj2alzkvysax7xrck"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; + netcoh = derive2 { name="netcoh"; version="0.1"; sha256="0id86wvws213695sv81mrmf4chz9xfyhaf58q1vfhq8yxfhw1fnd"; depends=[Matrix Rcpp RcppArmadillo]; }; + netdiffuseR = derive2 { name="netdiffuseR"; version="1.16.2"; sha256="1ck5sxmwsraggznf1i2z8q2kmjs75nf63y6s2zik14ini5dd5qyw"; depends=[boot Matrix Rcpp RcppArmadillo sna SparseM]; }; + netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[corpcor cvTools glasso glmnet igraph]; }; netmeta = derive2 { name="netmeta"; version="0.8-0"; sha256="0qadg3h9aa3qx51hvqikzb5s087r5ihmp6ffxg5x1bmw86yfi2bq"; depends=[magic meta]; }; - nets = derive2 { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; + nets = derive2 { name="nets"; version="0.8"; sha256="10h6sqy9jw2a909nzmzd5x9cjg3w4wpqwikp23k4q9fj71aswd5v"; depends=[igraph]; }; nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; }; network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; }; networkD3 = derive2 { name="networkD3"; version="0.2.8"; sha256="0w3wax4sfi67k9qjfkz5xfkqzr7ssmkm912snvfbxyynclkzbdrj"; depends=[htmlwidgets]; }; - networkDynamic = derive2 { name="networkDynamic"; version="0.8.1"; sha256="1ypxamgbmlswx24nrsahzjj86a44d2flkn37hlj8apxpfpi4b2bq"; depends=[network statnet_common]; }; - networkDynamicData = derive2 { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[network networkDynamic]; }; + networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; }; + networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; @@ -5513,21 +5779,21 @@ in with self; { neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; neuralnet = derive2 { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; - neuroim = derive2 { name="neuroim"; version="0.0.4"; sha256="1xz7695l5xpc28jdmpirk4f9s1d3zg5cxzhk89hknkl1wyxc15hx"; depends=[abind assertthat hash iterators Matrix Rcpp stringr yaImpute]; }; + neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; ngram = derive2 { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; }; - ngramrr = derive2 { name="ngramrr"; version="0.1.1"; sha256="1h12nm0dg2mkq5b2zn12cij24nl8inqn04m4jxdi1lr6r81y1wsq"; depends=[tau]; }; + ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[batchmeans Rcpp RcppArmadillo]; }; - nhanesA = derive2 { name="nhanesA"; version="0.6.2.1"; sha256="1fsrbgs11vycpm37skpnf9shzvqsy32rbprnymdfa0vdh9qkm464"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; + nhanesA = derive2 { name="nhanesA"; version="0.6.3"; sha256="0g4nhm1y6wqdvc1vf8r7m0yhvfmzj3hl4xil6m9vi2h8yp2sblv0"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhlscrapr = derive2 { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; }; nice = derive2 { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[numDeriv stringr]; }; - nleqslv = derive2 { name="nleqslv"; version="2.9.1"; sha256="0f8wc4mc398hi0knis4qal9icczgk4rnwsyqbxj39zil1sgyy6qx"; depends=[]; }; - nlme = derive2 { name="nlme"; version="3.1-122"; sha256="08kcfd5ayrznd8sabhh1wi1psx2l8jai5cgj1axcjvaa5l1r7i1n"; depends=[lattice]; }; + nleqslv = derive2 { name="nleqslv"; version="3.0"; sha256="0f5cnpz4kmpli7haczhv1qkp2f386n1yq7bdwgaxy0xa96cyyzmc"; depends=[]; }; + nlme = derive2 { name="nlme"; version="3.1-126"; sha256="1vvyzypr88sp2c12nngfzsc1m8w5a416ph28cawzji25m0b1py6i"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; - nlmrt = derive2 { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; }; + nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; nlnet = derive2 { name="nlnet"; version="1.0"; sha256="1ipds80qlv2zrl51v0n670g9ihb68sm98p06nvs97w05i64g8frq"; depends=[coin fdrtool igraph TSP]; }; nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; nlreg = derive2 { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; @@ -5540,20 +5806,21 @@ in with self; { nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; }; nlts = derive2 { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; }; nmcdr = derive2 { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; - nnet = derive2 { name="nnet"; version="7.3-11"; sha256="0kg5br2m6pn82hki1hsr7q6cjvzi92y4338qfq7c3iwy9zxd57lp"; depends=[]; }; + nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; - nnlasso = derive2 { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; }; + nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; - nodiv = derive2 { name="nodiv"; version="1.1.2"; sha256="0axjkac45yspxcy2v08z4li70xm0q07dscz568hkvnip33xsk5mi"; depends=[ape picante raster sp vegan]; }; + nodiv = derive2 { name="nodiv"; version="1.1.4"; sha256="0m12pw4l7lmqn796ac6yn3f9h5h59cv84swb8fk559aw258kpr4s"; depends=[ape picante raster sp vegan]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; nomclust = derive2 { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; }; noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; + noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; }; - nonnest2 = derive2 { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; }; + nonnest2 = derive2 { name="nonnest2"; version="0.3"; sha256="01j336lms0cinyzjhdgzqlh9hhvxx3lpri195cj2h0ssfzvy4z0z"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nonrandom = derive2 { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; }; - nontarget = derive2 { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat mgcv nontargetData]; }; + nontarget = derive2 { name="nontarget"; version="1.8"; sha256="01prm3lixr3qai3m8d83nmgx501mmrj45kx1k2xg1cy1n2c2ik17"; depends=[enviPat mgcv nontargetData]; }; nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; nopp = derive2 { name="nopp"; version="1.0.6"; sha256="0qcj3bci3iwq88vgbhxavvrkz8n276rx4q16f2vcqszzf6zajfr5"; depends=[mlogit]; }; nor1mix = derive2 { name="nor1mix"; version="1.2-1"; sha256="1sh7373w8z1mqkk8wvwzxab57pg1s3wcs6y6sx0sng7pf429x2m3"; depends=[]; }; @@ -5569,7 +5836,7 @@ in with self; { noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; np = derive2 { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; - nparACT = derive2 { name="nparACT"; version="0.1"; sha256="1sbajmn1fkvk4ay0daspnmd04qgpq34hvhc1cz4k94zx4nkh8lwx"; depends=[ggplot2 stringr zoo]; }; + nparACT = derive2 { name="nparACT"; version="0.3"; sha256="0984s2fb989z94x8jzmmp4zh0hy8ji74hzqqiv4145s9fb4rvn64"; depends=[ggplot2 stringr zoo]; }; nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; }; npbr = derive2 { name="npbr"; version="1.2"; sha256="0l6r9cwrhbi37p8prrjcli7rpvlxgzma2m1wqck5y97wx1fnh4h3"; depends=[Benchmarking np quadprog Rglpk]; }; @@ -5578,9 +5845,11 @@ in with self; { nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-4"; sha256="03yq8f2bfdyi21d8kqcca0byjrw9a7pgp0c6fwpk1lnniaabzn2d"; depends=[]; }; npmlreg = derive2 { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; }; + npmr = derive2 { name="npmr"; version="1.0"; sha256="1467zjd56p5b23am40gzr1vly7v8hhqiybfvgbxw1mnrvxzlvfj2"; depends=[]; }; npmv = derive2 { name="npmv"; version="2.3.0"; sha256="0719p38fh37lz7yclqp1l03pn8j051jm8hfzvxjd7m5kg0p083rh"; depends=[Formula]; }; nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; - npregfast = derive2 { name="npregfast"; version="1.0.1"; sha256="17zanw5dqmkm9257s4f98v4qlk4816ip7hkbxcq9pzkv87fhyvb2"; depends=[]; }; + npregfast = derive2 { name="npregfast"; version="1.2.1"; sha256="0ydxz4if5i54b45qsymzk5zl3ym0q08brvia4czx9h2r78db2v0g"; depends=[ggplot2 gridExtra shiny]; }; + nproc = derive2 { name="nproc"; version="0.1"; sha256="0ddj4iarmm2wk56rlb9ifzip8j7cwfja1p8jsn2769x0b2mz2n1n"; depends=[ada e1071 glmnet MASS randomForest]; }; npsf = derive2 { name="npsf"; version="0.1.6"; sha256="0zaz7yxb39x8c04bx5gzrryp9jn3sylk4gyv1nlrgqig8v7020qy"; depends=[Formula]; }; npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; }; npsp = derive2 { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; }; @@ -5593,7 +5862,7 @@ in with self; { nsprcomp = derive2 { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; }; nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; }; numDeriv = derive2 { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; }; - numOSL = derive2 { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; }; + numOSL = derive2 { name="numOSL"; version="1.9"; sha256="1vz7hvd79v4iydhq3jmpigsymd2disdkkw28svzb68zdiccbxfnd"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.6-1"; sha256="1mqcps33az5a7vd2czx7nll87yciwmxngnilf16iz4yf9p59gny5"; depends=[]; }; nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; @@ -5602,10 +5871,11 @@ in with self; { nycflights13 = derive2 { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; }; oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; - oai = derive2 { name="oai"; version="0.1.0"; sha256="1cd1z51z343bh0kbw5j77zgldqhfvfmd9n0dnkzp7hfpq4py3nwp"; depends=[httr xml2]; }; + oai = derive2 { name="oai"; version="0.2.0"; sha256="14vimvaba5fxcfl2n8dqa78jw51ra3nvqmw8js5x0d81yp47yaga"; depends=[httr plyr stringr xml2]; }; oapackage = derive2 { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; }; oasis = derive2 { name="oasis"; version="0.99.5"; sha256="03jcy766bj3z9km2jlf2wpjkfvkryffkjlvchpyh5hgfkm4vs2cv"; depends=[fslr oro_nifti]; }; - oaxaca = derive2 { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; }; + oaxaca = derive2 { name="oaxaca"; version="0.1.3"; sha256="0pi3lrvx5cjl35hww9w8bwh0720zibph636c2ay38k83lzf3kcb8"; depends=[Formula ggplot2 reshape2]; }; + obAnalytics = derive2 { name="obAnalytics"; version="0.1.0"; sha256="0k8zb81wf51kcrnlw9616vfbm150x17ggxhd23fm71a1n3292xvc"; depends=[ggplot2 reshape2 zoo]; }; objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; obliclus = derive2 { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; @@ -5615,7 +5885,7 @@ in with self; { obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; oc = derive2 { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; }; - oce = derive2 { name="oce"; version="0.9-17"; sha256="0j1sj9qlcg0yrdhpqinrpaa8dv4d8c8hjl48028x75frsc784pip"; depends=[gsw]; }; + oce = derive2 { name="oce"; version="0.9-18"; sha256="1vqfw1y6dj094cn9jy0pq39r1v2przqdrl1add6amssgxyh3bak1"; depends=[gsw]; }; ocean = derive2 { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; }; ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; }; ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; @@ -5628,20 +5898,24 @@ in with self; { okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.2.1"; sha256="0hnsv5b283lscj3b3pygjzyghc0glpavpijl7drv59ka9914ixl6"; depends=[Rcpp]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; - omics = derive2 { name="omics"; version="0.1-1"; sha256="16xvj8hs2iiaqjaipvj9ras5l3vwhvgyikdml08wpl53rx5falhi"; depends=[lme4 pheatmap]; }; + omics = derive2 { name="omics"; version="0.1-4"; sha256="1klzh431lcw2r8ylvqzl7xcyvr7bqapk3v15slfn9n27bbaljicp"; depends=[lme4 pheatmap]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; }; onewaytests = derive2 { name="onewaytests"; version="1.1"; sha256="13d2jcj8sb3gvv0k73bcaplsf2i2hf8fswcnvykpnps9lb6kvn0v"; depends=[]; }; onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3"; sha256="11dp1fxb26rzv2743wgwyrc35bslm57yi3a57r7wjixkp9vf9kkb"; depends=[rARPACK Rcpp RcppArmadillo]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; + ontologyIndex = derive2 { name="ontologyIndex"; version="1.0"; sha256="1x7x5smfxprlpsd5jjzh7rqcpiih2plmlnjjl9ww6vbkcdlk783d"; depends=[]; }; + ontologyPlot = derive2 { name="ontologyPlot"; version="1.0"; sha256="0z8bppcpc8d9rzk3h3c5c9pa1hnhdymx77d00lji2nldrlnsil89"; depends=[functional magrittr ontologyIndex Rgraphviz]; }; + ontologySimilarity = derive2 { name="ontologySimilarity"; version="1.0"; sha256="0wqdsss43xfsm90jr7j07yrmpcj3xm0ax8jaad6cqlq60ywm2a8n"; depends=[ontologyIndex Rcpp]; }; opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; }; - openNLP = derive2 { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; }; + openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; }; - openair = derive2 { name="openair"; version="1.6.7"; sha256="08bvcf0vsb3wz2mc3kdlwb5j1yw060qz0g6yrxpbwvpriyyprpal"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; }; - opencpu = derive2 { name="opencpu"; version="1.5.1"; sha256="09lbxwnjzrdgiq3hi2ak3ary4nqfv1368rrbxrf32ki5qh9is8la"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; }; + openVA = derive2 { name="openVA"; version="1.0"; sha256="1bqfysxx5qjdz0p7kmvjjbivnh384zq7z1nxidn33kr1wnsnvmcq"; depends=[ggplot2 InSilicoVA InterVA4 Tariff]; }; + openair = derive2 { name="openair"; version="1.7-3"; sha256="1g63jjsdi4658qkjwzdhdd11s45fm0y5xp975i0sd9vkxgiffxg4"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; }; + opencpu = derive2 { name="opencpu"; version="1.5.4"; sha256="1sn8hvq0bwlrb3bd7ril1mynhfjbfkgrgx5f515767gav9hv1v4m"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; }; openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; - openssl = derive2 { name="openssl"; version="0.8"; sha256="1l56bap1gmr1mq90i6465ihihgq1vwy8qspskjm558pyimrxiv58"; depends=[]; }; + openssl = derive2 { name="openssl"; version="0.9.2"; sha256="1dbsaciz39zvsmcyxkmpfm5yxzrpw2iv2nb86525wn80q0cyv0cb"; depends=[]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; openxlsx = derive2 { name="openxlsx"; version="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; }; operator_tools = derive2 { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; }; @@ -5662,7 +5936,7 @@ in with self; { optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; optmatch = derive2 { name="optmatch"; version="0.9-5"; sha256="1dgsxd6w2fgy07yzihbrg30ya0lmy146m70cfaaxr6pnr8d0rszr"; depends=[digest Rcpp RItools survival]; }; optparse = derive2 { name="optparse"; version="1.3.2"; sha256="1g8as89r91xxi5j5azsd6vrfrhg84mnfx2683j7pacdp8s33radw"; depends=[getopt]; }; - optpart = derive2 { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; }; + optpart = derive2 { name="optpart"; version="2.2-0"; sha256="1v90lfma06q10h6g43fh7pq1dpgdgcqsgwd73zf4z1ksq3pcx6wh"; depends=[cluster labdsv MASS plotrix]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; @@ -5679,7 +5953,8 @@ in with self; { ordinalCont = derive2 { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; }; ordinalNet = derive2 { name="ordinalNet"; version="1.4"; sha256="06sbb7x46f9cp1dhvf0x3kzpy05766yi15kw7cpzpmfz1pvk9ixs"; depends=[]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; - ore = derive2 { name="ore"; version="1.2.1"; sha256="0bbliizfhfbpd75hyjvn9qq9k572vrlqvgp3bm4s48zf8zdsddid"; depends=[]; }; + ore = derive2 { name="ore"; version="1.3.0"; sha256="08fdqppf2nm5h367zr2v9323p1v5qm8vby5y1ygjrwqgankpjcjg"; depends=[]; }; + ores = derive2 { name="ores"; version="0.1.0"; sha256="1k5qcdd92vnx2vclpgk64kkfi389bl1nvwafffgdy7jbgyp65rh4"; depends=[httr]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; orloca = derive2 { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; @@ -5692,19 +5967,21 @@ in with self; { orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; + osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osrm = derive2 { name="osrm"; version="1.1"; sha256="0ib80fw4kj75gy750d1pp8ja9nb152nmwrm1gxqvrrc1kczwickj"; depends=[jsonlite RCurl reshape2 sp XML]; }; + osrm = derive2 { name="osrm"; version="2.0.0"; sha256="0sapp03i3dbvsfwvnzj3pwqbkrx73qgdaikpnjl4k8bv424p0xc0"; depends=[jsonlite RCurl sp]; }; ouch = derive2 { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; }; outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - overlap = derive2 { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; }; + overlap = derive2 { name="overlap"; version="0.2.6"; sha256="066zf4i6anklqqmxf06lyfr9w4scw0djqgp8rabgpzwkvk9xgxmb"; depends=[]; }; + overlapping = derive2 { name="overlapping"; version="1.2"; sha256="0rcil0925lj166mpgc8xvy3fnp9y84mc902jqd2lyxkqrpc0zv1s"; depends=[lattice]; }; oz = derive2 { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; - pAnalysis = derive2 { name="pAnalysis"; version="1.0"; sha256="09wr7w9gch26gwvgcv6f1sawv2bxsmkclds3vki3n5gn31mlj1wc"; depends=[coin ggplot2]; }; + pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; - pRF = derive2 { name="pRF"; version="1.1"; sha256="1ygxvx8z43lvsjg4c3ajzs7k83ymgmpcxdj9sx9ffxpjfyp4nvaa"; depends=[dplyr ggplot2 magrittr multtest permute randomForest reshape2]; }; + pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; pROC = derive2 { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; @@ -5716,13 +5993,12 @@ in with self; { packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.1.1"; sha256="0xvw283gyjak3j66g8x5jy2jdrkcxwhfzck2wdq2q6a6nxbyb0i1"; depends=[Rcpp]; }; - packdep = derive2 { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; - packrat = derive2 { name="packrat"; version="0.4.6-1"; sha256="1jbgknnkd2ylfrzrqlwqcq441wblki2m1xbpiar1dvd9kq4awdvs"; depends=[]; }; + packrat = derive2 { name="packrat"; version="0.4.7"; sha256="0160ani3zlvffc2ap0cjhw8d727vxs80k2xh59mj04swiy115g48"; depends=[]; }; pacman = derive2 { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; }; paco = derive2 { name="paco"; version="0.2.3"; sha256="1qdaqy3m105wrafxjld6qhrvwcyrjb7ryrh782zpvy9m8yhy0p4j"; depends=[plyr vegan]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pagenum = derive2 { name="pagenum"; version="1.0"; sha256="0iqx6lgbzcz5girw8cl934jcah7l32zdrbs70cxx8gs2x5rbfwkz"; depends=[]; }; - pageviews = derive2 { name="pageviews"; version="0.1.1"; sha256="0va88ppxswrhmy6p6dks6mr25pw1shy10chmrhjwhb3vffyip7xk"; depends=[httr jsonlite]; }; + pageviews = derive2 { name="pageviews"; version="0.2.0"; sha256="1pfv7nfj4s51dawq6z9vwhs92wdl7hjq6pi6rsv0qh6pp9adl7sk"; depends=[httr jsonlite]; }; pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; @@ -5735,13 +6011,13 @@ in with self; { paleofire = derive2 { name="paleofire"; version="1.1.8"; sha256="1g3m1chdqbivq5s7p1n53cfzq1cm5v0wkj4f4s0dih6pcid44si7"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; paleotree = derive2 { name="paleotree"; version="2.6"; sha256="08861pvr86dbynx687vbxziq3v08ii6hx0g8h5zcskz87x32q2lc"; depends=[ape phangorn phytools]; }; palettetown = derive2 { name="palettetown"; version="0.1.0"; sha256="0zpqbd9g50vyidd0chhk2xqlzx7mnzyilr4c84lci1xw3r3avxp0"; depends=[]; }; - palinsol = derive2 { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; + palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; }; palr = derive2 { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; }; - pan = derive2 { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; }; + pan = derive2 { name="pan"; version="1.4"; sha256="1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76"; depends=[]; }; pander = derive2 { name="pander"; version="0.6.0"; sha256="0jgylffc4ymvppaqsflxaj1l18c4x49jbz0b86jjsa00xqdyk4cn"; depends=[digest Rcpp]; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; }; @@ -5753,7 +6029,7 @@ in with self; { parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramlink = derive2 { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; }; - params = derive2 { name="params"; version="0.4"; sha256="1axs59zald4vngi9g5r66q7pgzm7mpl3yxv39fbnvcd0bdin0a76"; depends=[whisker]; }; + params = derive2 { name="params"; version="0.5.0"; sha256="0i2fb305gkjq8j2n3bfphv0zirv2qxl61rcpnci1qvg2cy44qnzn"; depends=[whisker]; }; paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; }; parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; }; @@ -5772,12 +6048,13 @@ in with self; { partools = derive2 { name="partools"; version="1.1.3"; sha256="07bvhs6a53cm0gvmxbibg8rhzvjxrhjgl65ib348a4q43pgap2v1"; depends=[]; }; partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; party = derive2 { name="party"; version="1.0-25"; sha256="08arvh7bhc67ih1mm6faslw7jgh86f9n9qgswav0mjkg9icny86l"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.0-4"; sha256="1cvjx5zkjn2rjcg1wg4kpsvs7a0d9wq450vxp6a8rnwzkhp5n1ja"; depends=[survival]; }; + partykit = derive2 { name="partykit"; version="1.0-5"; sha256="13x668b7vq49jrpdk0ja7lnrv335xx50g21d7jlv0g5s8laa392d"; depends=[survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; }; + password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; }; - patPRO = derive2 { name="patPRO"; version="1.0.0"; sha256="0bmmknfa8yvdgz693q3q3kn7qr4d7vgrigsszwnxhsrqi2kny63l"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; + patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-3"; sha256="0gbbdszrprshcpnpbnvqmx0wlij2d36fw94ssfbx11d7fmjpaj37"; depends=[stringr]; }; @@ -5786,20 +6063,19 @@ in with self; { pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; pathological = derive2 { name="pathological"; version="0.0-7"; sha256="0ki8a7i03c4hq7af1zq7n7z1glq15jh03zr4l4m05dblyn0nfsm7"; depends=[assertive_base assertive_files assertive_properties assertive_reflection assertive_strings assertive_types plyr stringr]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[geometry mapproj rcdd rgl]; }; + pavo = derive2 { name="pavo"; version="0.5-5"; sha256="02xxmblp9k2hrv1ya0sxddd710hhsz5s7kh9xbg7m47h9fkvqy22"; depends=[geometry mapproj rcdd rgl]; }; pawacc = derive2 { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; }; - pbapply = derive2 { name="pbapply"; version="1.1-3"; sha256="0gchlhmhl8jjv2wngy0c0kjhgbvkhr7sj6lcm9w7wjya89nnhawf"; depends=[]; }; + pbapply = derive2 { name="pbapply"; version="1.2-0"; sha256="1sr5nr5ljdah2cs2wcfgfd0bzd4y4nk9kgp1wym1v4s9wxcbjc6x"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; }; - pbdBASE = derive2 { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[pbdMPI pbdSLAP rlecuyer]; }; - pbdDEMO = derive2 { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[pbdBASE pbdDMAT pbdMPI pbdSLAP rlecuyer]; }; - pbdDMAT = derive2 { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[pbdBASE pbdMPI pbdSLAP rlecuyer]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.3-0"; sha256="1l3b9i8w48y713is2lcgjyx9xlc3ha2fnvq9pjr93g7wzxa3dnd6"; depends=[rlecuyer]; }; + pbdBASE = derive2 { name="pbdBASE"; version="0.4-3"; sha256="1jj2bhb0l8cyai3scb73lqf6dl8vq8c16yfmdll11z2zhvpkwdd9"; depends=[pbdMPI pbdSLAP]; }; + pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-0"; sha256="1rrmixpr9zc6dmhif4lmpxfc1zpwy8hfwph31yn1pz5dipmaay88"; depends=[pbdBASE pbdDMAT pbdMPI]; }; + pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-0"; sha256="16039jvm8n4lx82jw5p1i5yylm5fcb9rh39law41wq845a318ihd"; depends=[pbdBASE pbdMPI]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.3-1"; sha256="0rk38v1iwkzd119xyb18vprc08yvdx1bs55vv1j519zscpppbqfq"; depends=[rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; - pbdPROF = derive2 { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; }; - pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[pbdMPI rlecuyer]; }; - pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-0"; sha256="13v3xp6mwb0i93vsx9wyg636gqk1q3mk6sgi90a5q8caa16ax2ag"; depends=[R6]; }; + pbdPROF = derive2 { name="pbdPROF"; version="0.3-0"; sha256="0k3d70r01zlldqvz638fgizndfcaczjq79hr3ran3a6mm6jfn5z9"; depends=[]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-1"; sha256="1yl7hk7h285nkgf4ayprjgm0gai848igvhgym5y0bqnnlir8kdqx"; depends=[pbdMPI rlecuyer]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-1"; sha256="1afav138zkc4m0qymyprh20fgkc225v5yb966058jphzvm21n6rb"; depends=[R6]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; - pbkrtest = derive2 { name="pbkrtest"; version="0.4-4"; sha256="0cdx79slxrhm8py5jcw2zacb48mwlsxwjv2g4p1dv87wycp3k1d6"; depends=[lme4 MASS Matrix]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pcIRT = derive2 { name="pcIRT"; version="0.2"; sha256="18rqyhkzjaqjvsyh3vr3dv9jwqvsa28d0vhnnzj72na6h6rx31w4"; depends=[combinat Rcpp]; }; @@ -5807,11 +6083,11 @@ in with self; { pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; pcaL1 = derive2 { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; }; pcaPP = derive2 { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; }; - pcadapt = derive2 { name="pcadapt"; version="2.1"; sha256="1lf5l512pwxnxv9bd5qkxvdfx8wflcs56n8byp3i8f1bmgnn0ipd"; depends=[MASS robust]; }; + pcadapt = derive2 { name="pcadapt"; version="2.2"; sha256="0nlm1wmkcrdacfaixhna42z9vdcb3j1nczkd2qcsx6kklkrjhvik"; depends=[MASS robust]; }; pcalg = derive2 { name="pcalg"; version="2.2-4"; sha256="0qx0impxh6pzbgdhpkbl13qfql4zpsa3xiy4hc640d15zxprv6zw"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; }; pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; - pch = derive2 { name="pch"; version="1.0"; sha256="0q9pmkxxff7dw9bai7a71ja7xc581gmvn7cjilk1h4rhl9dbr5b8"; depends=[survival]; }; + pch = derive2 { name="pch"; version="1.1"; sha256="1vwdp4j66p2vj47psdazbaq7g0n4ldl0295z0v0k5d9q8j719ww2"; depends=[survival]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.3"; sha256="1qcz18cac59i1c6limwknzwsl7svplls9i45jvvfqz91p8q68cgl"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; @@ -5819,8 +6095,11 @@ in with self; { pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; }; pdfetch = derive2 { name="pdfetch"; version="0.1.7"; sha256="12ddf3kyw9pppjn6haq7a3k27vl17016s4h2mc31mbb9fn6h4cjz"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; }; + pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; + pdftools = derive2 { name="pdftools"; version="0.2"; sha256="0ys3g18gx8ibwj4srcjp37s7fb5ls392knm36jqbbgrl638jglkd"; depends=[Rcpp]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; + pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; }; peacots = derive2 { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; }; peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; }; pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; @@ -5832,37 +6111,42 @@ in with self; { pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; }; pegas = derive2 { name="pegas"; version="0.8-2"; sha256="1sci4m7vvxi8p8lwqkqng04pajrby0c4l91sav3ahvfgj6xldp9q"; depends=[adegenet ape]; }; + pems_utils = derive2 { name="pems.utils"; version="0.2.17.8"; sha256="1qxsjzxb8gdw1hyxgd923s609k98pjdaxs6wm3pg4bl1w8sxqi8d"; depends=[ggplot2 lattice latticeExtra loa plyr RColorBrewer]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; penalized = derive2 { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; }; penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; }; - pendensity = derive2 { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[fda lattice]; }; + pendensity = derive2 { name="pendensity"; version="0.2.10"; sha256="023gl993jniv5r8l9nkaha7v6k2rb1hxm7z543dpr4186kjbi7zl"; depends=[fda lattice]; }; pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; }; peplib = derive2 { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; - pequod = derive2 { name="pequod"; version="0.0-4"; sha256="12gmdfhi4dh5zhy3mwgjlpwhkqj8irwbcj13f0z23001hpis3wmh"; depends=[car ggplot2]; }; - perARMA = derive2 { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; }; + pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; + perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.0.2"; sha256="027bcr4ipjwmm1hni2mg7n4hz4mgs1dh2npqmfp8b5kqmccyxpx6"; depends=[doParallel foreach ggplot2]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; - permute = derive2 { name="permute"; version="0.8-4"; sha256="1z5pmq9dy93rpsdb73waqrqmnvvi9ygx1v5l81a2n1j1kb4lmksv"; depends=[]; }; + permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; + permubiome = derive2 { name="permubiome"; version="1.1"; sha256="02fg1g96pg6a87n8mhrls54xp0vnqqsgg39nnjirxr7hd74l71x9"; depends=[ggplot2]; }; + permutations = derive2 { name="permutations"; version="1.0-0"; sha256="0k6y57ya9bk57l6wq4zz8rnsj02vcfhkl5giw30dxdnv4lxqf73s"; depends=[magic numbers partitions]; }; + permute = derive2 { name="permute"; version="0.9-0"; sha256="0w68cqw6s4pixix8bh1qzsy1pm64jqh1cjznw74h82ygp8sj7p73"; depends=[]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; - pez = derive2 { name="pez"; version="1.1-0"; sha256="1rfjchh4qzydbg9mw3k7vp2s66fllz4a1lza55ramzn259dzkgv0"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; }; + pez = derive2 { name="pez"; version="1.1-1"; sha256="14n9s604wwh07kjir5kw6sra6bbmnpg00h3zvli3zqd8lx892hm8"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; }; pgam = derive2 { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; - pgirmess = derive2 { name="pgirmess"; version="1.6.3"; sha256="0rn6xhfm2cl2l4p0hdcgz34njq2wwbkb0qdyix84lb8wsly27mxx"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; + pgirmess = derive2 { name="pgirmess"; version="1.6.4"; sha256="1180dbxy392g06j9n2r0dlbr8rrhf0w1n273pawl8mblmf29vwz2"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; pglm = derive2 { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; pgmm = derive2 { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; + ph2bayes = derive2 { name="ph2bayes"; version="0.0.1"; sha256="09ns3i5dgbn8573g4sism6d3y8jp26icy21l8d8px91jfhlx7kxv"; depends=[Rcpp]; }; phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; - phangorn = derive2 { name="phangorn"; version="2.0.1"; sha256="1g9ikxdmkchv0faayf6z2jgwr8jis7khpq8q0avkwqqnsdn5sair"; depends=[ape Biostrings igraph Matrix nnls quadprog]; }; + phangorn = derive2 { name="phangorn"; version="2.0.2"; sha256="1ywyd5ljkm7b8qfis2d7nzz4q04b0pfkscwf6vmbb31cziks2d1j"; depends=[ape igraph Matrix nnls quadprog]; }; phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.8"; sha256="1ik0k69kb4n7xl3bkx4p09kw08ri93855zcsxq1c668171jqfiji"; depends=[gtable RColorBrewer scales]; }; @@ -5877,36 +6161,39 @@ in with self; { phonR = derive2 { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; - phonics = derive2 { name="phonics"; version="0.5.4"; sha256="1qwh43az9dm3mnyjzki0lvxrpi3gb383gx5m34xr5rlqnxv0wfai"; depends=[BH Rcpp]; }; + phonics = derive2 { name="phonics"; version="0.6.3"; sha256="12ysjbpap9nkgg1kybgxq3f4qc54qpiqzf1dj4izmkgagqxms5xy"; depends=[BH Rcpp]; }; + photobiology = derive2 { name="photobiology"; version="0.9.5"; sha256="1fdpn9r1mg0l6ckw73ihh6gl8z6vswxqidb6fk76kvb5c1saldlq"; depends=[caTools dplyr lubridate plyr splus2R]; }; + photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.0"; sha256="038rsszxvja5kcm87w5vpk1hwcl6r68lyv15w1w449xcphb3c4ky"; depends=[photobiology]; }; phreeqc = derive2 { name="phreeqc"; version="3.3.1"; sha256="0jzzzmijlmrwmpv9xfj9lq9kppxgk6hmfbp90wj2bpnhyyhkchqi"; depends=[]; }; phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; phyclust = derive2 { name="phyclust"; version="0.1-16"; sha256="19i5cpiss2k94zg03m00j9yc7zr0xsx3c8v8b7hkgv0kf9p40vjn"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; }; - phylobase = derive2 { name="phylobase"; version="0.8.0"; sha256="1zpypg6qrc39nl96k02qishw61sq4b62qw0mq3inmkrwf7w031m6"; depends=[ade4 ape Rcpp rncl RNeXML]; }; + phylobase = derive2 { name="phylobase"; version="0.8.2"; sha256="0wspm8fv2lps2z6zhz3qrf3icad1mgpq4379gmbi3i614h25r5gp"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; - phylocurve = derive2 { name="phylocurve"; version="1.3.0"; sha256="014y7l2q3yjzj2iq9a6aspnd7dkvjfwnz46rs7x6l45jy41494wb"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; }; + phylocurve = derive2 { name="phylocurve"; version="2.0.2"; sha256="0wbsl3mcrjjbq0aihnam2raxmk1895x5wy4x0jnzic4mpxfjwnnd"; depends=[ape doParallel doSNOW drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; - phylolm = derive2 { name="phylolm"; version="2.3"; sha256="0fqxclg15169mqqrfw0s76idcwl9r358sg74jzn5fbg7kg6d3kva"; depends=[ape]; }; + phylolm = derive2 { name="phylolm"; version="2.4"; sha256="0smgdfqb0kg3ka6g5azshlw1ig1djk9j01pc7hqzf6rymy9wkxxg"; depends=[ape]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; phylosignal = derive2 { name="phylosignal"; version="1.1"; sha256="039sdb5cyijsrvj13xznr0j7vcp780lif62xk5x5hpzxvpg1wwgk"; depends=[adephylo ape boot igraph phylobase Rcpp RcppArmadillo RCurl]; }; phylotools = derive2 { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; }; phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; }; phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; }; - phytools = derive2 { name="phytools"; version="0.5-10"; sha256="1423p9qb44jgw89z5iaqx8zaydr6558fpmygxhkppaid9w13b0il"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.5-20"; sha256="1k43pf04mb1lsj5vhbj1rx4jadanrdsxfbl2j57wvxswk6fxihpz"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; pi0 = derive2 { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; }; picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; }; picasso = derive2 { name="picasso"; version="0.5.0"; sha256="1m9fjpg6nx0c8fnh0m5g29gfrnprhzgzx5162r9sjf8i1xspawn4"; depends=[igraph lattice MASS Matrix]; }; pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; }; - piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.0.0"; sha256="0ax414alawzhh8n7wbvkv97r8lv5l9jjcsp8ki4v7bfp6bq9aspd"; depends=[ggm lavaan lme4 lmerTest nlme]; }; + piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.1"; sha256="09x0nb6qbpikaxn2n7dq71dk25miv6rq96kpm24927l72dgx82gj"; depends=[ggm lavaan lme4 nlme]; }; + pinfsc50 = derive2 { name="pinfsc50"; version="1.0.0"; sha256="15zliybiw6mwyvcyi3n55jn996h2yl6j2m02yfns72g8p6sg89gk"; depends=[]; }; pingr = derive2 { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; }; pinnacle_API = derive2 { name="pinnacle.API"; version="1.90"; sha256="10fpb7zsl22y61dsgxh2yphf5yn5b2dv42xd441q53xbpxsdhw7f"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; }; pipe_design = derive2 { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; }; pipeR = derive2 { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; }; pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; - pixiedust = derive2 { name="pixiedust"; version="0.5.0"; sha256="155kxckfpxags8iy33qkp8b9yn46qjzz7a510ja48290wqzjgs8s"; depends=[ArgumentCheck broom dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; }; + pixiedust = derive2 { name="pixiedust"; version="0.6.1"; sha256="170550dsmc1c5qk288d6qw9xhxn415fgncyf4gqdsl6b5h632c11"; depends=[ArgumentCheck broom dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; depends=[]; }; @@ -5915,27 +6202,25 @@ in with self; { plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; }; plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; - planar = derive2 { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[cubature dielectric plyr Rcpp RcppArmadillo reshape2 statmod]; }; + planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; }; planor = derive2 { name="planor"; version="0.2-4"; sha256="0k5rhrnv2spsj2a94msgw03yyv0hzrf8kvlnbhfj1dl7sb1l92a1"; depends=[conf_design]; }; - plantecophys = derive2 { name="plantecophys"; version="1.0"; sha256="1x50v13pphlhk14qib51b9vdv4rvqdjjlhc4gvpmikl87cw8xy4z"; depends=[]; }; + plantecophys = derive2 { name="plantecophys"; version="1.0-2"; sha256="1lb5jzigwabqdcb11chlkv4xdbazlnda70scj49x13hmgk7j8lz5"; depends=[]; }; plaqr = derive2 { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; }; playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; }; - plfMA = derive2 { name="plfMA"; version="1.0.1"; sha256="1lgcx8jdi4y3gnf4050cjb5krrbg99m7097r1hibv8kc3kcbjx46"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; }; + plfMA = derive2 { name="plfMA"; version="1.0.2"; sha256="0ji3070hwyiqikpmlw7pn16mbfpgqpn6mgf4836r0vk6j3bd3fd0"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; }; plfm = derive2 { name="plfm"; version="2.1"; sha256="19l5n7syp6xcj4d5qxccsard70d5q8ph1f87prj2zgpq5spyp7an"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; plm = derive2 { name="plm"; version="1.5-12"; sha256="0zsdm0d6vvyliz7k3l2b8xzp1qp8yahibczzhnrmm9py6sp8m7jz"; depends=[bdsmatrix car Formula lattice lmtest MASS nlme sandwich zoo]; }; plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; - plot2groups = derive2 { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; }; - plot3D = derive2 { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; }; - plot3Drgl = derive2 { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[plot3D rgl]; }; + plot3D = derive2 { name="plot3D"; version="1.1"; sha256="1xy4h9k1ddz040ns7dfqqckkmb165f2h4xfz44h8lfwazr59dzgg"; depends=[misc3d]; }; plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; }; - plotKML = derive2 { name="plotKML"; version="0.5-4"; sha256="12sxs7bzbcgcrp7jph9ad6gnvvwafhygjkcid84cmzbaqvh0d26s"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; + plotKML = derive2 { name="plotKML"; version="0.5-5"; sha256="15gdn2dq6jy6rd1xiahqnkg7l7j033906vg5qp8myjxqmlcqk7h4"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; - plotROC = derive2 { name="plotROC"; version="2.0.0"; sha256="1g3q13prqj90xz8s0xpk76mx0xi26akiph2qnz9qv60pcc103p68"; depends=[ggplot2 gridSVG plyr shiny]; }; + plotROC = derive2 { name="plotROC"; version="2.0.1"; sha256="1r80712svlm8kfbnymv27wrn60bckxnmq1rva3caln5b58swzcdk"; depends=[ggplot2 gridSVG plyr shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.1"; sha256="0xpq8h7xm9p25wcfp9av0vwz4hdm4ibrwy68pff8fdf7bb1fy49w"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotly = derive2 { name="plotly"; version="2.0.16"; sha256="1kibc4d7hc7qn6qxsqmbzn7p8a4w3nnd79wrjzb594ab2jafq06s"; depends=[base64enc digest ggplot2 htmlwidgets httr jsonlite magrittr plyr scales viridis]; }; + plotly = derive2 { name="plotly"; version="3.4.1"; sha256="0krx2gnji6fr5gw46yva1dir32z2m50qlnh7h6mhs7w89cbfqwvp"; depends=[base64enc digest ggplot2 htmlwidgets httr jsonlite magrittr plyr scales tidyr viridis]; }; plotmo = derive2 { name="plotmo"; version="3.1.4"; sha256="0b12w6sg317vgmhyn4gh9jcnyps1pyqnh5ai15y1dfajsf2zjhca"; depends=[plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotrix = derive2 { name="plotrix"; version="3.6-1"; sha256="1y8xnlpy4zba70af9lwj2sshvfdfcmfdh92wamyzj8z9gciailfr"; depends=[]; }; @@ -5955,13 +6240,13 @@ in with self; { plyr = derive2 { name="plyr"; version="1.8.3"; sha256="06v4zxawpjz37rp2q2ii5q43g664z9s29j4ydn0cz3crn7lzl6pk"; depends=[Rcpp]; }; pmc = derive2 { name="pmc"; version="1.0.1"; sha256="19yphb0834qriq7w2y287750rrc0kqibx76yx95qwyh6ymzcvha2"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; - pmclust = derive2 { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[MASS pbdMPI rlecuyer]; }; + pmclust = derive2 { name="pmclust"; version="0.1-7"; sha256="1k6lllhx8ki9c8kkl6al75zqy50h570j49242wb39h50s78bxp00"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; }; pmg = derive2 { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; }; pmlr = derive2 { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; }; pmml = derive2 { name="pmml"; version="1.5.0"; sha256="192jffh9xb7zfvx4crpynrbdrx1fpiq303c2xz1wjqnq7wjmb3qw"; depends=[survival XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; - pnea = derive2 { name="pnea"; version="1.2.3"; sha256="0zpa0gjqlyzvmc9c9rv4fvm8jd5b7naygwmjg90vlbc87sff0xp4"; depends=[]; }; + pnea = derive2 { name="pnea"; version="1.2.4"; sha256="1yfh1z09x822zzila6kq82s5cn4sgnbprwmim251y61k3xw0ad9m"; depends=[]; }; pnf = derive2 { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; @@ -5971,28 +6256,29 @@ in with self; { pogit = derive2 { name="pogit"; version="1.0.1"; sha256="19sawm7j5fa9s1nlz4hvhpgjj7n3rrnsh2m5a6scxis4brnaa98n"; depends=[BayesLogit ggplot2 logistf plyr]; }; poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; - pointRes = derive2 { name="pointRes"; version="1.1.0"; sha256="189wyg0wj4c0ra8fnlwhjrcx55g89vnh7vrnninr86n5zkz8pm5i"; depends=[ggplot2 gridExtra plyr TripleR]; }; + pointRes = derive2 { name="pointRes"; version="1.1.1"; sha256="1l1rn3siz1rgwx41vgknjxsiklkk2q1sycnlgd394j62v0pl23am"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; }; - pollstR = derive2 { name="pollstR"; version="1.2.1"; sha256="0sny330a0d8jicsgyc1qa2mwhxgxng50w2fv3ml1nncml8b88k40"; depends=[httr jsonlite plyr]; }; + pollstR = derive2 { name="pollstR"; version="1.2.2"; sha256="1ii832gil8ppwf8hd8simnbqbc4yq75myb2zin9wmimm5zaqzn2s"; depends=[httr jsonlite plyr]; }; polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; }; polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; }; polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; polyapost = derive2 { name="polyapost"; version="1.4-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; depends=[boot rcdd]; }; - polyclip = derive2 { name="polyclip"; version="1.3-2"; sha256="0gsckb5nwfq1w48g67pszk3ndzvj63r8rp7vhh77idizaczkv0r1"; depends=[]; }; + polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-0"; sha256="0yb119y0a2xjsijxbrxgksnhf3m997dgp9d57wghq68dsfjp3hf3"; depends=[lhs MASS]; }; + polyclip = derive2 { name="polyclip"; version="1.4-1"; sha256="0aaqakzxba9xqnr3wd7x3r7qkk16gb9d6kgbgrnxd1vn15p449j6"; depends=[]; }; polycor = derive2 { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.0"; sha256="01rl3s7dav1i643fq3r9x8brff48xi49jqiv3hsh8rlifny8wf0z"; depends=[Rcpp RcppArmadillo]; }; polynom = derive2 { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; }; polysat = derive2 { name="polysat"; version="1.4-1"; sha256="0n44l66x270biigwf8lwbzsqd3p4zv40firrw07sfbf779cbwd3h"; depends=[]; }; polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; - pomp = derive2 { name="pomp"; version="1.2.1.1"; sha256="12xsd7hrd1dqpfwsrrsx7q46msqv90bz4nrnwgdnd7mvnp2yppn4"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; + pomp = derive2 { name="pomp"; version="1.3.1.1"; sha256="1jy20h9qk80plizsqjbynvadphxz7hnji3pgl6ln48cddgn26qjf"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; pooh = derive2 { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; }; popEpi = derive2 { name="popEpi"; version="0.2.1"; sha256="0xna95gqqbqlfxaarzvyq4c724sxqw0fh9kn46sf674lr13n0jj2"; depends=[data_table Epi]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; @@ -6000,10 +6286,9 @@ in with self; { popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; }; popbio = derive2 { name="popbio"; version="2.4.2"; sha256="1p0699hvc0qbp5sgxh812rbmkiqxbm8c9zrv4m9iq9dq5ad53zrc"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; }; - popgen = derive2 { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; }; popgraph = derive2 { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; }; poplite = derive2 { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.1.0"; sha256="1l3wcy1505h01i7hzk3qy0lbkslqrxpqds8rzbin70iwvj2mj96c"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.1.1"; sha256="1sav268n00h56ppc4adda4qpbmx3wsjyiz4q784qwzf6i6f46faa"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.1"; sha256="0zcl4kbb9yrrkkky9qx30g42qphibi7mq1bwkncw2dn5gjkx4zf8"; depends=[poppr readxl]; }; popsom = derive2 { name="popsom"; version="3.0.1"; sha256="0qj4l5cdzrhiaq1q6q7wv75jnbfvw1rrms2v6ffw34wz4fs1w6is"; depends=[fields som]; }; population = derive2 { name="population"; version="0.1"; sha256="1xcm38hipasf6x5grsn7dqayy2g5mwppx2dvi5lwax5a6dqjk792"; depends=[abind]; }; @@ -6018,8 +6303,9 @@ in with self; { powerMediation = derive2 { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; + powerplus = derive2 { name="powerplus"; version="1.0"; sha256="0k8kir2lcr8036phfnhgw573nhfqijlh56p3pzgzbchwzrj9z10r"; depends=[expm MASS Matrix phonTools]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; - ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GOSemSim igraph]; }; + ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; }; ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; @@ -6033,24 +6319,25 @@ in with self; { praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; }; prclust = derive2 { name="prclust"; version="1.1"; sha256="0dm7qjvwyrym3sff24k5zz87835dhldrm3qiyyx6xq92p0wn89jz"; depends=[Rcpp]; }; - precintcon = derive2 { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; }; - precrec = derive2 { name="precrec"; version="0.2.0"; sha256="1942fl986bkrjhqx94xvhfl85y6iqwj35x8p3jqvlciw5zn8zclc"; depends=[assertthat ggplot2 gridExtra Rcpp]; }; - predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; }; + precintcon = derive2 { name="precintcon"; version="2.2.1"; sha256="1z63aa8i2jyc0a8n5q1ny2p3mzxadyk1kk94rz8dp6j6kp2hxnf8"; depends=[ggplot2 scales]; }; + precrec = derive2 { name="precrec"; version="0.3.1"; sha256="0i131qzmvv1sscl6ngh4gd6i39whph697pwv2sycwr480cqw07pq"; depends=[assertthat ggplot2 gridExtra Rcpp]; }; + predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme plyr]; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; }; - prepdat = derive2 { name="prepdat"; version="1.0.5"; sha256="0c8lg6kap275gnfh53rai2kyy3my3w598wjh84da481rwrd3vlz9"; depends=[dplyr psych reshape2]; }; + prepdat = derive2 { name="prepdat"; version="1.0.7"; sha256="05i6iv4vk83lcmpsqcn85vq62p3irfmbf1zjs5prl2d88xlqj7w9"; depends=[dplyr psych reshape2]; }; preprocomb = derive2 { name="preprocomb"; version="0.2.0"; sha256="0kfmdz926ianvy016hb6ba20qkh9pbgnzi1dali4bc4h8qhnjz5y"; depends=[arules caret clustertend DMwR e1071 randomForest zoo]; }; - presens = derive2 { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; }; - preseqR = derive2 { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; }; + preproviz = derive2 { name="preproviz"; version="0.1.1"; sha256="0k2jap204zqwbbq53vdvzks8kivyp7myg1s9srfd8x6jqcy045yi"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; }; + presens = derive2 { name="presens"; version="2.0.0"; sha256="1srrb1d2f5bszkcpi2xdq7ccjhsyp3dihfr0zqhn0m71whnzhi7z"; depends=[birk marelac]; }; + preseqR = derive2 { name="preseqR"; version="2.0.0"; sha256="06jxd7vndvf63bwlsyc3ydwiw5z88y1i87iqd32gchfrg4iaw6xl"; depends=[polynom]; }; prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; }; - prettymapr = derive2 { name="prettymapr"; version="0.1.3"; sha256="126m1r7iv20wnkfvnvgj8d2axh3vlgvcfniy1d1c9685b55lcyj2"; depends=[digest rgdal rjson sp]; }; + prettymapr = derive2 { name="prettymapr"; version="0.1.4"; sha256="02ha33fppxj4hp7xicpzjri50cbvgzx0mi3nlxc60zvb5gm0zgkk"; depends=[digest foreach rgdal rjson sp]; }; prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; - prevR = derive2 { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; + prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; - primerTree = derive2 { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; }; + primerTree = derive2 { name="primerTree"; version="1.0.3"; sha256="0k81h6ln9yjg3r4j8n5f8g8xlrq1pvrr5ywrw16s4mjjhx3r1ylg"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; }; primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; }; princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; @@ -6066,7 +6353,7 @@ in with self; { profileR = derive2 { name="profileR"; version="0.3-2"; sha256="0mr8gzw8055bmqla3kz8g996mnwdki1m3dlxhyrig8h2fy1gmx5a"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; }; profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; }; - proftools = derive2 { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; }; + proftools = derive2 { name="proftools"; version="0.99-2"; sha256="1vx0270sgx15dl6x3nnx13v5y4c0m18yvrhiycl429zky0jzxfr0"; depends=[]; }; progenyClust = derive2 { name="progenyClust"; version="1.1"; sha256="0d3p38mb0vg7ymzi751wkdcpkfqzf45li6zsvm8rvma41ky06w63"; depends=[Hmisc]; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; }; @@ -6075,7 +6362,7 @@ in with self; { propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; }; - proportion = derive2 { name="proportion"; version="1.1.0"; sha256="1ahcgp485a5gal8hlsnd18kadb22q0r7p81xxh73rwghbv3y49va"; depends=[ggplot2 TeachingDemos]; }; + proportion = derive2 { name="proportion"; version="1.2.0"; sha256="12f4jddr99bv306m6rdvzc1l1xpl7zgg84ka7b691m4s957faxcv"; depends=[ggplot2 TeachingDemos]; }; prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; @@ -6085,22 +6372,23 @@ in with self; { protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; }; proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; + prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; protr = derive2 { name="protr"; version="1.1-1"; sha256="09iwyfvscz0ajgadfd69hhsnhkaqwpjnly9g6jjrdcqnaj4lw77l"; depends=[]; }; - provenance = derive2 { name="provenance"; version="1.1"; sha256="1dd4wcxgkm7skv6jw2bg94la3vzdyjfvcr3047rzmzj1bfb68q5m"; depends=[MASS smacof]; }; + provenance = derive2 { name="provenance"; version="1.4"; sha256="0kcqa4my4ccbnwp30ir3yxlds8r54kf46s3f0fq7q4dnyajwn4pk"; depends=[MASS]; }; proxy = derive2 { name="proxy"; version="0.4-15"; sha256="17qnrihxyyyj0lx6hka4mwkgy764ha4jx00a822xjnnbygk81iqv"; depends=[]; }; prozor = derive2 { name="prozor"; version="0.1.1"; sha256="0yv9yzp8ldn888v2sg62qaq0vjg5xwjq9274x68idrlywzgplfgv"; depends=[doParallel foreach Matrix seqinr]; }; pryr = derive2 { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; }; - psData = derive2 { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; - psbcGroup = derive2 { name="psbcGroup"; version="1.2"; sha256="19kadl21av82adi3kaa7a6h9yphp7vqb6h4c4d8q6i58xj48sxcv"; depends=[LearnBayes mvtnorm SuppDists]; }; + psData = derive2 { name="psData"; version="0.2"; sha256="0a663giyi0si7pck3zsn0bzl0w1r1g60mp3x8vqzazivccjxc1lf"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; pscl = derive2 { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; - pse = derive2 { name="pse"; version="0.4.3"; sha256="01rl7f1mmqizbl6gkq39ll490224cq4h96xvb3qzpikxb2p1d9gp"; depends=[boot Hmisc]; }; + pse = derive2 { name="pse"; version="0.4.5"; sha256="0yy6y3xlhqpm8csslv5g8xbnq168and9qxp3xvcl84kif9p064nh"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; }; pseval = derive2 { name="pseval"; version="1.0.0"; sha256="17w98qda2h6as2g02fqv6vvrw8m90zsdcfa0i5ss8c546fzchzxl"; depends=[survival]; }; psgp = derive2 { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; }; psidR = derive2 { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table foreign RCurl SAScii]; }; pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; + psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; pspline = derive2 { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; }; pssm = derive2 { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[abind MASS MHadaptive numDeriv]; }; @@ -6115,16 +6403,17 @@ in with self; { ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; ptw = derive2 { name="ptw"; version="1.9-11"; sha256="0vh5xv26l27pbx1g9xrj4vcv2bv75cjxs3zf5zcalrnga2lhbdjw"; depends=[nloptr]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; - pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.4"; sha256="044xc8yjk2qm4ppvk666ddk6kfznif6jwb49yrypxvg61ffg2s3j"; depends=[boot R2HTML RCurl XML]; }; + pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.5"; sha256="0993sx2zhrjl9maqrapl3hmy4g4gfm0m1x1vasi4rfdb5rqk5387"; depends=[boot R2HTML RCurl XML]; }; + pubprint = derive2 { name="pubprint"; version="0.1.1"; sha256="0zfbl5xmn0f5dwh8wanvnwfdswjjv9vjnhkfjlsymmwchkxm6b1j"; depends=[stringr]; }; pullword = derive2 { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; }; pumilioR = derive2 { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[RCurl XML]; }; purge = derive2 { name="purge"; version="0.2.0"; sha256="1kv65as811x53jwg8b26cf9mhhicyn8ncnlsbd9zc0qlg61h00q2"; depends=[]; }; - purrr = derive2 { name="purrr"; version="0.1.0"; sha256="1bcvqc2ccg72asyasysgm1p3hppl97wsr0az1f5x8q7c5ri2mynp"; depends=[BH dplyr magrittr Rcpp]; }; + purrr = derive2 { name="purrr"; version="0.2.1"; sha256="01pms115c0jjb5gsm1l3bxj116cqm8g3zkgn020l384nbmdafzsr"; depends=[BH dplyr lazyeval magrittr Rcpp]; }; pushoverr = derive2 { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; }; pvar = derive2 { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp]; }; pvclass = derive2 { name="pvclass"; version="1.3"; sha256="1mlzvcbv1zvciz3hp01pwwanq3q8bapgn2dl90syhj15q5pzb4f7"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; }; - pvrank = derive2 { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; }; + pvrank = derive2 { name="pvrank"; version="1.1"; sha256="12yqnhh1y7sz3pb40736vrhhyza12h8iffjm7f9mimnjzpmi5k8i"; depends=[EnvStats Rmpfr]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; pweight = derive2 { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; }; pwr = derive2 { name="pwr"; version="1.1-3"; sha256="0ng0n5qn9im9fdpyv2i2g80kzfa7dk3knfjf4xdpypfdw2gjrf02"; depends=[]; }; @@ -6132,7 +6421,7 @@ in with self; { pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive2 { name="pwt8"; version="8.1-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; }; pxR = derive2 { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; }; - pxweb = derive2 { name="pxweb"; version="0.5.57"; sha256="0qvafshxrxz2cvipz4rvj1rpmqmh264w78dk8jvyqvyl9qyg2724"; depends=[data_table httr plyr RJSONIO stringr]; }; + pxweb = derive2 { name="pxweb"; version="0.6.0"; sha256="0jxw70wm6rla2v4k6aqzbj6kmxbdj8rqhshmsgmm9vqhpwj2mvkd"; depends=[data_table httr plyr RJSONIO stringr]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; pystr = derive2 { name="pystr"; version="1.0.0"; sha256="1my0prvil8l2lqc9x8qi0j1zfzxl0ism5v2581himp5n5bcv8gkk"; depends=[]; }; @@ -6140,7 +6429,6 @@ in with self; { qPCR_CT = derive2 { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; }; qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; qap = derive2 { name="qap"; version="0.1-0"; sha256="0fc6c3pzlm79nqs9qkngs8m0y8y9syhgilfsav9bbi6ylfhlmdh0"; depends=[]; }; - qat = derive2 { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[boot fields gdata gplots moments ncdf XML]; }; qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; }; qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; }; qcr = derive2 { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; }; @@ -6149,34 +6437,35 @@ in with self; { qdapRegex = derive2 { name="qdapRegex"; version="0.6.0"; sha256="0k6n3zr07ccr9xlmkyg6m0pp7plh91066b61zrn7jphgs0d31c0a"; depends=[stringi]; }; qdapTools = derive2 { name="qdapTools"; version="1.3.1"; sha256="0sfzqmds888r599mwm7j0qjsqfv6z59p4apmmg36hsyaxmw51233"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; - qgraph = derive2 { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; + qgraph = derive2 { name="qgraph"; version="1.3.2"; sha256="0bziwpdqgx1pmj61jn7ydri0zfmphf77lxhgm873cllb4czgrl74"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; }; - qicharts = derive2 { name="qicharts"; version="0.4.3"; sha256="04c833ggqsmblkys3sxszyr0f41bm52lyakadxfc8mf9mdwqac9p"; depends=[ggplot2 lattice latticeExtra scales]; }; + qicharts = derive2 { name="qicharts"; version="0.5.0"; sha256="09wxw995hxfb8235pi532q3gclmyidh8m6arfszyrd6hbkf0bjv5"; depends=[ggplot2 ggrepel lattice latticeExtra scales]; }; qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; }; qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; }; qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; }; qmap = derive2 { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; }; - qmethod = derive2 { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[digest GPArotation knitr psych xtable]; }; + qmethod = derive2 { name="qmethod"; version="1.4.1"; sha256="0m52xq903v91mw2aqqnvqivlgs39zmcy274ph5zgj3gsz71sq1l4"; depends=[digest GPArotation knitr MCMCpack psych xtable]; }; qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; qpcR = derive2 { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; qqman = derive2 { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; - qqtest = derive2 { name="qqtest"; version="1.1"; sha256="1g0pxssls8id3h69chrq1qxsj4vhzizzim0lr7g5ixanqnc1ilna"; depends=[robust]; }; + qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; }; qrLMM = derive2 { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrcm = derive2 { name="qrcm"; version="1.0"; sha256="0xjxb2z1h63azbs7gqvqf4a2sk9syzjqkfrvfdcmliv2bv7zf70l"; depends=[pch survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; }; - qrjoint = derive2 { name="qrjoint"; version="0.1-1"; sha256="0q39n4y7cdmim88na3pw05w15n95bpqnxknvh6fzz9mpbbjkxqx5"; depends=[coda kernlab Matrix quantreg]; }; - qrmtools = derive2 { name="qrmtools"; version="0.0-3"; sha256="0s8hnj2iaa1qkbqvjbviaprh2lyj4j37ypblykj0w591xm1jyl9z"; depends=[xts]; }; + qrjoint = derive2 { name="qrjoint"; version="1.0-0"; sha256="18jmxb5wv16gy4vf0cgp4x885s53i3z3qmc46bdr4md513mc980w"; depends=[coda kernlab Matrix quantreg]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-5"; sha256="0p245mh7qwv1fm9wi7wk2jm9pdy7r6jkhnqvcpzf6cnhcl0s6hs5"; depends=[Quandl quantmod zoo]; }; qrng = derive2 { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; }; qrnn = derive2 { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; }; qtbase = derive2 { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; }; qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; }; - qtl = derive2 { name="qtl"; version="1.38-4"; sha256="0rv9xhp8lyldpgwxqirhyjqvg07dr5x4x1x2jpyj37dada9ccyx3"; depends=[]; }; + qtl = derive2 { name="qtl"; version="1.39-5"; sha256="1grwgvyv7x0dgay1858bg7qf4wk47gpnq7qkqpcda9cn0h970d6f"; depends=[]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-3"; sha256="0b0kv5nipdavify4vslwhq9p7nmhwk71q3xmnkj66b780605mvr6"; depends=[qtl]; }; + qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; qtlcharts = derive2 { name="qtlcharts"; version="0.5-25"; sha256="132v2cqi23m1pb7yz7859snsxjj7dmv6gpv5p9lzb5dpa2n8aha6"; depends=[htmlwidgets jsonlite qtl]; }; qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-4"; sha256="1kx4iajhnjilciz9vda0s1mxqxa0h69vm3gpwdpbghgc5cj8d8kh"; depends=[]; }; @@ -6188,19 +6477,21 @@ in with self; { quadrupen = derive2 { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; qualV = derive2 { name="qualV"; version="0.3-2"; sha256="16pjn2la4da9466rafl5drlzx2rcf3vy68b5wz27aacyr15nvdcb"; depends=[KernSmooth]; }; + qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; }; quantable = derive2 { name="quantable"; version="0.1"; sha256="0q1m971fk9i2qdyps745g89x34anw0g2hxqf5p8ggfvvr32k635r"; depends=[gplots RColorBrewer scales]; }; quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; - quanteda = derive2 { name="quanteda"; version="0.9.0-1"; sha256="14x2bbrklzwgvqkwp1cmi5akrhdg7fjxvx4vh291y52ds4ml18m4"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; }; + quanteda = derive2 { name="quanteda"; version="0.9.4"; sha256="1mmhs4f2ps6fa66pszmbj828mi5ypaa8nlwbw5fv0kh0vqfy83kf"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; }; quantification = derive2 { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; - quantileDA = derive2 { name="quantileDA"; version="1.0"; sha256="1xskjh107s4v5bg6yzjg52r52zy4rw0hadn643q4n6l8sr7879ws"; depends=[]; }; + quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantmod = derive2 { name="quantmod"; version="0.4-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; }; - quantreg = derive2 { name="quantreg"; version="5.19"; sha256="0nbrlmci2r2s9z0cr16l8bl8sz0cxfr7dw5a8fdirfmjsrw3w62c"; depends=[Matrix MatrixModels SparseM]; }; - quantregForest = derive2 { name="quantregForest"; version="1.1"; sha256="0gzjnwbzib4bckxirrcdjlylq90dwacwvz9k3sskffsi4fd5d3ga"; depends=[randomForest]; }; + quantreg = derive2 { name="quantreg"; version="5.21"; sha256="1cx1axadmd768m6hg4hgnnihyphkrxlmj2dg04k91466wypbxh6l"; depends=[Matrix MatrixModels SparseM]; }; + quantregForest = derive2 { name="quantregForest"; version="1.2"; sha256="0bgqdmicz0diffgb6hcqm7zgxckjrp5gpph2hnxsicsv8qfr6jsm"; depends=[randomForest]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.3-1"; sha256="0cm4ac9rn5vhqhi7f5qiilym1vp7x6bglwghw22b70nf9zvcap9h"; depends=[quantreg]; }; quantspec = derive2 { name="quantspec"; version="1.2-0"; sha256="029k1klbcvwprvjggrm0i1hzpybw05r4bsm0awcyjzzrgd8hdmp9"; depends=[abind quantreg Rcpp snowfall zoo]; }; - questionr = derive2 { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[classInt highr htmltools shiny]; }; + questionr = derive2 { name="questionr"; version="0.5"; sha256="1n3qv4ynddhhh0h9n0v21y7dq7mq5rmg0qqh3spxgrj0acrnqzhp"; depends=[classInt highr htmltools miniUI rstudioapi shiny]; }; queueing = derive2 { name="queueing"; version="0.2.6"; sha256="0w6fnjql9ap5vlhiv6syphrkhnp4qp7f4clw2jn155vqqmj5ii6a"; depends=[]; }; + quickReg = derive2 { name="quickReg"; version="0.0.1"; sha256="0lnbhqx7kf1hc7xa6ikk2khqrngqg22rph9zkj6z8f7zlsbpspxh"; depends=[ggplot2 psych survival]; }; quickmapr = derive2 { name="quickmapr"; version="0.1.1"; sha256="0wqkn8svpi6m9f04kl0vivg2j9ydhq488a9m36s7br7n4zyvc5vm"; depends=[httr raster rgdal rgeos sp]; }; quickpsy = derive2 { name="quickpsy"; version="0.1.2"; sha256="0nvx7zcmfpfsr94k0wdmpcyyqjwilx8ciy12l8s22y9psz5ripsz"; depends=[boot DEoptim dplyr ggplot2 MPDiR tidyr]; }; quint = derive2 { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[Formula partykit rpart]; }; @@ -6214,7 +6505,7 @@ in with self; { r2lh = derive2 { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; }; - rARPACK = derive2 { name="rARPACK"; version="0.9-0"; sha256="0i57db2dls72xfrvn1m0fwsfqa7cq839diviisn8686wx6dp2i8l"; depends=[Matrix Rcpp RcppEigen]; }; + rARPACK = derive2 { name="rARPACK"; version="0.11-0"; sha256="12h2y46xcfldhjdmm960swgn9b23zvkj5vg2bi42s9qxwgi02d63"; depends=[RSpectra]; }; rAltmetric = derive2 { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; }; rAmCharts = derive2 { name="rAmCharts"; version="1.1.2"; sha256="1c9mrzi0bd2fpv2jvhabb243k2z36k6cxffgcykxi8f62rpvhmq9"; depends=[data_table htmltools htmlwidgets rlist]; }; rAverage = derive2 { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; }; @@ -6226,9 +6517,10 @@ in with self; { rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; - rDEA = derive2 { name="rDEA"; version="1.2-2"; sha256="05adyzj9cyviz5dy0c86m9hkb8k13qkjxrw9xkk1710z50i427jd"; depends=[maxLik slam truncnorm truncreg]; }; + rDEA = derive2 { name="rDEA"; version="1.2-3"; sha256="1xhrgglnidpzqwkvwnwnnpcx23il0jgfp394rsc74pwdsbv1ifz9"; depends=[maxLik slam truncnorm truncreg]; }; rDNA = derive2 { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; }; rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; }; + rEDM = derive2 { name="rEDM"; version="0.4.7"; sha256="1d1ylm5rmbrrknmc82vlbhqqkl62drs25gwqid4adflpj2gxczhz"; depends=[Rcpp]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; rFerns = derive2 { name="rFerns"; version="2.0.0"; sha256="0mfwlypakk409p17cmj8q9g99aq8z8gzg54dhpw351ixblvnil98"; depends=[]; }; @@ -6237,16 +6529,16 @@ in with self; { rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; }; - rJava = derive2 { name="rJava"; version="0.9-7"; sha256="14wlcq9bcccs9a2kimsllgi9d0hsgnjc5q2xlc0qz8w5rffi54iw"; depends=[]; }; + rJava = derive2 { name="rJava"; version="0.9-8"; sha256="12mxajy300gyi5bsd3fn84nvj83chr8ls0mrh3mm9nhl2h1mxnns"; depends=[]; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rLTP = derive2 { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; }; rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; - rNOMADS = derive2 { name="rNOMADS"; version="2.1.6"; sha256="05czi6cv80afc2rlmqksdln6xvhaf4f7z8d8jp8npd5livrys2d7"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.2.0"; sha256="0ihrg88rklgn4fa2b7zcs9bxfawhxgxdxlwslkh4ngcz2v72cfnp"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; rPlant = derive2 { name="rPlant"; version="2.12"; sha256="12aclndwijnaw14iqb2q7m5c2zh2bgdpfzmf11sgiwv5680qhdmh"; depends=[RCurl rjson seqinr]; }; - rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0"; sha256="0vg60gjl1r1pxlmj435z61aizwdvi9gn2x94927858l3ca8r9afy"; depends=[mvtnorm ssanv]; }; + rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; }; rPref = derive2 { name="rPref"; version="0.7"; sha256="005qphrcwnkfi2wmm7ba0swykq17q9ab7c7khqyixb0y9gyrwing"; depends=[dplyr igraph Rcpp RcppParallel]; }; rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; rSCA = derive2 { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; @@ -6260,34 +6552,35 @@ in with self; { rYoutheria = derive2 { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RCurl reshape2 RJSONIO]; }; race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; + radarchart = derive2 { name="radarchart"; version="0.1.2"; sha256="1zhkzc1x411q14drdkhwrivsz818hvqrv1zyvcyq3a3dl65xavqr"; depends=[htmltools htmlwidgets]; }; radiomics = derive2 { name="radiomics"; version="0.1.1"; sha256="0rw1xvp7nq8h5g4yqqcwrv706zssa0kvkhm6ncdb9y7gmpidhyj5"; depends=[reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.1"; sha256="1i37ynxl85yzh5pyxykjn64p5qph1w9b1gappmlhql9z04095ryk"; depends=[hermite]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; rags2ridges = derive2 { name="rags2ridges"; version="2.0"; sha256="0qc93a1bf63iwgmpz9bz62j20p4v77bvbjmy4rqchj7z6h573njd"; depends=[expm fdrtool ggplot2 Hmisc igraph Rcpp RcppArmadillo reshape sfsmisc snowfall]; }; - rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; ramify = derive2 { name="ramify"; version="0.3.2"; sha256="0fqspa1nlf0969g3lvvwg65zimwfdj5c2bahxvafggn832sb54k9"; depends=[]; }; ramps = derive2 { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; }; + ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; }; randNames = derive2 { name="randNames"; version="0.2.1"; sha256="177xdgrikvfcgjag382v5d1j72322ihnbggzxp9ip6p48ib4p3qg"; depends=[dplyr httr jsonlite]; }; randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; random = derive2 { name="random"; version="0.2.5"; sha256="0n96zv3b95msahpzdwfqsd9i9bq2z94flxxm8ghnqb0b75qcsdg0"; depends=[curl]; }; random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; }; randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.1"; sha256="0q4xjh7qqmd4slxwd1z5mnpn4y3vx1vbn6v060zbd0afibpcw92b"; depends=[ddR Matrix randomForest]; }; - randomForestSRC = derive2 { name="randomForestSRC"; version="2.0.5"; sha256="0b06whh8jdpcm79b952nl8f997xrz1sf7h2vk19sg8fzh8qvq2xx"; depends=[]; }; + randomForestSRC = derive2 { name="randomForestSRC"; version="2.1.0"; sha256="1x9xlf808gs25wqpa0a7gfxf0fdgf6jgj8237g61s1yx3vninhnn"; depends=[]; }; randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; }; randomLCA = derive2 { name="randomLCA"; version="1.0-6"; sha256="1l343p9a6z2ld3z2kqwldmn3wxf8yvjqr4nfhyjwp4y5d2ic9r11"; depends=[boot fastGHQuad lattice Matrix SciencesPo]; }; randomNames = derive2 { name="randomNames"; version="0.1-0"; sha256="0v92w0z0dsdp6hhyyq764nlky8vmbs6vcnrna5ls47fj80f9cqa4"; depends=[data_table]; }; randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; }; randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; }; randomizeBE = derive2 { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; }; - randomizeR = derive2 { name="randomizeR"; version="1.0"; sha256="0ajipzihp17hs5bvqbqssv5z701y6iyy09cahgp5f9qj12kmhplc"; depends=[ggplot2]; }; randomizr = derive2 { name="randomizr"; version="0.3.0"; sha256="1zi8rldmgjcjnnx3qcpr555c4g713nh6wrdh5gr77z2qagbljb1i"; depends=[]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; }; + rangeBuilder = derive2 { name="rangeBuilder"; version="1.1"; sha256="1a2cjpl3hxynwpzc4rz5g0g5gq2h15jvbcvkdqv59j905rhaikg1"; depends=[alphahull raster rgdal rgeos sp stringi]; }; rangeMapper = derive2 { name="rangeMapper"; version="0.3-0"; sha256="0r8nf2y4drdfldfr1rv1ll4176w3hzd9qf36glzjdsm0g1fcixba"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; - rangemodelR = derive2 { name="rangemodelR"; version="0.1"; sha256="00fhdcsf77x4hw059lg1x1qhgjjwrraxin1g5h0knxwsv33j56z8"; depends=[]; }; + rangemodelR = derive2 { name="rangemodelR"; version="1.0"; sha256="19wbzrim0mjngdfsrmfidk1csh7fzqv6cwh4hxvjgjl2ps99cank"; depends=[]; }; ranger = derive2 { name="ranger"; version="0.3.0"; sha256="1vi0wkks5rzn6mc6k2lh0rdbb5awvcfww68kk0wndng45mk7hrq2"; depends=[Rcpp]; }; rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.0-2"; sha256="1gx30ak5vjgbgnx920789d38y16rl8w7hbxfk9yb8xjl1azgfaqx"; depends=[survival]; }; @@ -6297,14 +6590,14 @@ in with self; { rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rasclass = derive2 { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car e1071 nnet randomForest RSNNS]; }; - rase = derive2 { name="rase"; version="0.2-21"; sha256="16zcdfsj2lkwq1madv1k01s7n7njs5lb7bj4dg0dr0jgpjarhkgq"; depends=[ape mvtnorm phytools polyCub rgl sm spatstat]; }; + rase = derive2 { name="rase"; version="0.2-22"; sha256="0wva7dd7zsclqxk3imkvbi98rxsvd1axr1l1msfcf9r8xrzybshf"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; raster = derive2 { name="raster"; version="2.5-2"; sha256="0x6rmd4mcvivkisxpjlp7myf8crz58md2ngz6qsz37i8aw1hn3jb"; depends=[Rcpp sp]; }; rasterVis = derive2 { name="rasterVis"; version="0.37"; sha256="1pfpjrjgcy5d4jzkf7sm427y0b6v0ipxr9p8z9sr6djhzcs3gfn0"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp zoo]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; - rattle = derive2 { name="rattle"; version="4.0.5"; sha256="0l505mg4s34r8xjdw2f8vz6mbhzfbsh1ag6p6lzxi6ay14kl50kq"; depends=[magrittr RGtk2 stringi]; }; - rbamtools = derive2 { name="rbamtools"; version="2.12.3"; sha256="0vh6kal5r5v708d3a4lsmgbssjb0b9l1iypibkd9v97j00cbk6rr"; depends=[]; }; + rattle = derive2 { name="rattle"; version="4.1.0"; sha256="0ww4bwwvivpk049lpv6k29zxkb0islhwh2qnlrvasgh2b9yig25p"; depends=[magrittr RGtk2 stringi]; }; + rbamtools = derive2 { name="rbamtools"; version="2.14.3"; sha256="1sdnz52vd5gfwc194y6ilrd8dkawv86xcd37100giz1525wf929i"; depends=[]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; rbhl = derive2 { name="rbhl"; version="0.2.0"; sha256="169nrbpi9ijzb5qk1b1dwjayfnsjq8r67dc7bis9aicyp4hpjyzw"; depends=[httr jsonlite plyr XML]; }; @@ -6312,29 +6605,32 @@ in with self; { rbison = derive2 { name="rbison"; version="0.4.8"; sha256="10kwlf7vrzw2rhsdwih5lcvjw0bz0n88mp74ayc9331d8j226214"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; + rbokeh = derive2 { name="rbokeh"; version="0.4.2"; sha256="05v3ry6mhbwl903rn2941qam2pvfkr0fnp7qzhgn9z12dxjmpl8i"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; - rcanvec = derive2 { name="rcanvec"; version="0.1.3"; sha256="1bsaprla9ypbmq7mv4sdba8szp2ij4mzsnfdwa58kw77w7r0fynh"; depends=[rgdal sp]; }; - rcbalance = derive2 { name="rcbalance"; version="1.8.0"; sha256="0j330ddax78bxfiv31l4796allbqq81l0dfj1q1w5ail1y8k62zz"; depends=[MASS plyr]; }; + rcanvec = derive2 { name="rcanvec"; version="0.1.4"; sha256="0mnrnwxk14i9yarrq4vhflkhqfdqz8vpn2z10c3rlyrx849xh7zi"; depends=[rgdal sp]; }; + rcbalance = derive2 { name="rcbalance"; version="1.8.2"; sha256="0jd6brswpm2ymvk3z72kzfg2axd4wan70dbcgvldjjaz2mvhz56z"; depends=[MASS plyr]; }; + rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; }; rcdd = derive2 { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; }; rcdk = derive2 { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.1.1"; sha256="0ksbqsz6q7ri3xknzh6sl39lq9wqrqqv5bmirybglf48q0prszf5"; depends=[knitr rmarkdown]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; - rcicr = derive2 { name="rcicr"; version="0.3.2"; sha256="153d6wl0grnfc842hpc5zd9m5xkybkmy1mpkw8wba4xy0mgppgjd"; depends=[aspace dplyr jpeg matlab]; }; + rcicr = derive2 { name="rcicr"; version="0.3.2.1"; sha256="0svr869x5sbzymk95g4lm0kbdi0f7dlbgk88i8jhp4wa3g98pwyv"; depends=[aspace dplyr jpeg matlab]; }; rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; }; rcorpora = derive2 { name="rcorpora"; version="1.1.1"; sha256="14lnfn9armb6rz1wcs7hdrb4j2vzh6b8pi9lsj83l3zixkxx5izk"; depends=[jsonlite]; }; - rcppbugs = derive2 { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[BH Rcpp RcppArmadillo]; }; - rcrossref = derive2 { name="rcrossref"; version="0.3.4"; sha256="1glgcclc4zqipccmdniqy4ajsh32y3azwkd7cc75i855gbk8vdmn"; depends=[bibtex dplyr httr jsonlite plyr XML]; }; + rcppbugs = derive2 { name="rcppbugs"; version="0.1.4.2"; sha256="0b057hgw0g9i83l18przjziq5sakjsz7m8vif3lprzs1d91c2xn1"; depends=[BH Rcpp RcppArmadillo]; }; + rcrossref = derive2 { name="rcrossref"; version="0.5.2"; sha256="0a4xz43y40kl97yxc1hbsf84pyvkpz1l0p26nls8wm28x2wafb3b"; depends=[bibtex dplyr httr jsonlite plyr R6 xml2]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; + rdatacite = derive2 { name="rdatacite"; version="0.1.0"; sha256="1h8zrgy3ig4rsrm4j9ivff71mdyabrdp71cflxahw7c3q9iyjxhf"; depends=[oai solrium]; }; rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; }; - rdd = derive2 { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[AER Formula lmtest sandwich]; }; + rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; - rdian = derive2 { name="rdian"; version="0.1.0"; sha256="1lxhl1gjnmfbg5dzc2vw52hm2rk5m5nvx219nyh7w9ak88ih4wfd"; depends=[curl httr]; }; + rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; rdrobust = derive2 { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; }; rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; }; rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; }; @@ -6344,11 +6640,12 @@ in with self; { readGenalex = derive2 { name="readGenalex"; version="1.0"; sha256="1lhfw8xbwnjhslriaxziw4dskmjfawz5g31h2yl9ds2nwvwhmdwi"; depends=[pegas]; }; readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; }; readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.1"; sha256="03lnhajj75i3imy95n2npr5qpm4birbli922kphj0w3458nq8g8w"; depends=[base64enc digest XML]; }; - readODS = derive2 { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; + readODS = derive2 { name="readODS"; version="1.6.2"; sha256="07c223cjn29mldhs9xs343b0i2xpcpps5pk65a1jsmjabd9k69zl"; depends=[cellranger readr xml2]; }; readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; + readbulk = derive2 { name="readbulk"; version="1.0.0"; sha256="0gsw1f8ycfg2jn2mp6dk203g0avpb4820f37pl5kn7mm7fn5w7bg"; depends=[plyr]; }; reader = derive2 { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; }; readr = derive2 { name="readr"; version="0.2.2"; sha256="156422xwvskynna5kjc8h1qqnn50kxgjrihl2h2b7vm9sxxdyr2m"; depends=[BH curl Rcpp]; }; - readstata13 = derive2 { name="readstata13"; version="0.8.1"; sha256="0nx8x7m4vdi1ykmlndgirjapl4bv2dlqb6fpnq8k121najz6fj61"; depends=[Rcpp]; }; + readstata13 = derive2 { name="readstata13"; version="0.8.2"; sha256="1gp56wfyfcj1p1kix7iz0qr445ych3f0jkyjn5m7qkn7d43fimvd"; depends=[Rcpp]; }; readxl = derive2 { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="0.2"; sha256="11x8db6gq9qkv9skslda4j6zgzmkmiap78rlwnlvkjvk1gzz13bf"; depends=[dplyr httr jsonlite]; }; @@ -6358,6 +6655,7 @@ in with self; { rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; }; rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; }; rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-1"; sha256="0xkb5lp6798220cqy571rxj98cy673wn8kp0im3mcnpjx6p1q3n2"; depends=[rebus_base]; }; + rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recommenderlab = derive2 { name="recommenderlab"; version="0.1-8"; sha256="17bab1irh7q9kznf1qz6jh81b4c98wcx323hq666dk23rc2kg7zx"; depends=[arules bcv Matrix proxy registry]; }; @@ -6367,20 +6665,23 @@ in with self; { recosystem = derive2 { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; }; reda = derive2 { name="reda"; version="0.2.1"; sha256="0c96vs8h0g551gb5vxrlw2q1yzca4nwg579nwysxm7z16zn7p05k"; depends=[ggplot2 plyr]; }; redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; }; + reddPrec = derive2 { name="reddPrec"; version="0.2"; sha256="1s4xs98d7zkkgsvdyyck3ra7yhc1sg6pq89rf4rskmj9jp6h5x0d"; depends=[snowfall]; }; redist = derive2 { name="redist"; version="1.2"; sha256="1169dh4v8mq1ag1crqmn9apyd0280qf2l0df6xwy7263gvmnqdmy"; depends=[coda Rcpp RcppArmadillo sp spdep]; }; + redland = derive2 { name="redland"; version="1.0.17-7"; sha256="1frn3gxzs9v1k0hlw0r0ckgjynanmrx63njlgh085i5bw4n9bzbg"; depends=[roxygen2]; }; ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; - refGenome = derive2 { name="refGenome"; version="1.5.8"; sha256="12dnf6lbwmxb9zkzfv1s7ivc22z5fvdzf3glb83svyfcbw3fcmqf"; depends=[DBI doBy RSQLite]; }; + refGenome = derive2 { name="refGenome"; version="1.6.0"; sha256="0pn27m38x6xjpxrfvg92wwkx3syvvssy9dzn2djbq3lagvrz3k3z"; depends=[DBI doBy RSQLite]; }; referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; refset = derive2 { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; }; - refund = derive2 { name="refund"; version="0.1-13"; sha256="0xyx0z378hwqmp3lzr0ashsikzzzid2gd8ngkgsmfb473z19k5lz"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix MCMCpack mgcv nlme pbs RLRsim]; }; - refund_shiny = derive2 { name="refund.shiny"; version="0.1"; sha256="05wj3pr936rksbwbmm6d0rccvzvyl6xww21whjfpg8r1x05amfrj"; depends=[dplyr ggplot2 gridExtra refund reshape2 shiny]; }; + refund = derive2 { name="refund"; version="0.1-14"; sha256="17hig8zr8sj5jjxxrfr3bhvhhbimns92dzf3b7ybf94vzvrm8wg8"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix MCMCpack mgcv nlme pbs RLRsim]; }; + refund_shiny = derive2 { name="refund.shiny"; version="0.2.0"; sha256="1m7s9xnh7p7z7lc0dyizdmfnq3ksc782d3vavqrcakswjrkk3rir"; depends=[dplyr ggplot2 gridExtra lme4 refund reshape2 shiny]; }; refund_wave = derive2 { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; }; regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; regexr = derive2 { name="regexr"; version="1.1.0"; sha256="1gjv4wl4gjsh5rr0kz057x9j4dhikrm3zzlmxlhd1f9srjdmcdzy"; depends=[]; }; registry = derive2 { name="registry"; version="0.3"; sha256="0c7lscfxncwwd8zp46h2xfw9gw14dypqv6m2kx85xjhjh0xw99aq"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-4"; sha256="0ma1wddxhmja268ddkpcvskqf4lwq61brswnm600fms8ks7r78d3"; depends=[boot Matrix mvtnorm]; }; - regpro = derive2 { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; }; + regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; regress = derive2 { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; }; + regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; rehh = derive2 { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; }; @@ -6397,30 +6698,31 @@ in with self; { relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; }; reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; relimp = derive2 { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; }; - relsurv = derive2 { name="relsurv"; version="2.0-6"; sha256="1wn3s4faipyxyllyy221vzf8il2q00z53jjr315rlkgd577908sf"; depends=[date survival]; }; - rem = derive2 { name="rem"; version="1.1.1"; sha256="1hs8gi10d39x4qfmlccdwcw5r66l331xh4x3pqmimhj5a2hyqdy3"; depends=[flexsurv Rcpp survival]; }; + relsurv = derive2 { name="relsurv"; version="2.0-7"; sha256="107xn5an8ggwpsp5dhk88xglfkd90d06f63akd09vwaax92rws1y"; depends=[date survival]; }; + rem = derive2 { name="rem"; version="1.1.2"; sha256="0m0lhv8hc6p0d7nmjig2678n7qrb9c15jkdqrx946f42k1f1dz6f"; depends=[flexsurv Rcpp survival]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; }; remote = derive2 { name="remote"; version="1.0.0"; sha256="09840z50x5i8bsi49s3asqhcz84z16pyq9w50yay4h8x82w3hfh3"; depends=[foreach raster Rcpp]; }; - rentrez = derive2 { name="rentrez"; version="1.0.0"; sha256="035qfvw96gv4m924d9byj0rgj8qfljacbg3asrvpdl4k186f87qk"; depends=[httr jsonlite XML]; }; + remoter = derive2 { name="remoter"; version="0.2-0"; sha256="08wn0p95rj39s0df38jqs9bf52fw5a6m92sbn7kfspb81q1fzx8k"; depends=[assertthat pbdZMQ sodium]; }; + rentrez = derive2 { name="rentrez"; version="1.0.1"; sha256="1viw6lcjl26yq8yna8mfhriphvdjq8nnkbds0yq66fmah44l493v"; depends=[httr jsonlite XML]; }; repfdr = derive2 { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; }; repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; }; replicationInterval = derive2 { name="replicationInterval"; version="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; }; - repmis = derive2 { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; }; + repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repo = derive2 { name="repo"; version="1.0"; sha256="103bjd880hd76qpipryl17l9972hwj5c3dxicjq0dcbdfmdk7q7h"; depends=[digest]; }; - repolr = derive2 { name="repolr"; version="3.2"; sha256="0jcl8wssrcbs0phkpfpincndkgx1gcws24wc5q34wd9jhd3idndz"; depends=[Matrix Rcpp RcppArmadillo]; }; + repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; }; reportr = derive2 { name="reportr"; version="1.2.0"; sha256="00nbkv6s7lydxq1gd532gkfl96dbrdq4p6bmqxnbjhrwx8c3kx6h"; depends=[ore]; }; reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; - reproducer = derive2 { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; }; + reproducer = derive2 { name="reproducer"; version="0.1.4"; sha256="1iraq2aria3sgs63cm4508775y7qnaz1lxrs630nma0ndmjsp2ml"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; - rerddap = derive2 { name="rerddap"; version="0.3.0"; sha256="1aqcksry1ccdwc2y3n5mqp4fvq7phn2jcimlywkwrvd5fg2i60jx"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; }; + rerddap = derive2 { name="rerddap"; version="0.3.4"; sha256="1rfcql21kd39q5r1827scqxs124x3vkvxazdqp13g5qyalmdvb30"; depends=[data_table digest dplyr httr jsonlite ncdf4 xml2]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; - resemble = derive2 { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; }; - reservoir = derive2 { name="reservoir"; version="1.0.0"; sha256="178yb8wp82acbn76dg6kz9cn5hnxkkfpnkasj7pfz00l1jakn7li"; depends=[gtools]; }; + resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; }; + reservoir = derive2 { name="reservoir"; version="1.1.4"; sha256="0c7ankmwph38nny24rw9ysqmwhszp8wivpawpf3qdy2wxhm1ygfv"; depends=[gtools]; }; reshape = derive2 { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; @@ -6435,44 +6737,46 @@ in with self; { reutils = derive2 { name="reutils"; version="0.2.2"; sha256="0byp2kh1g7zi391y55b2y34gbg5x459xn6ydz8ns2qah2aqciqwk"; depends=[assertthat jsonlite RCurl XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; }; + revealjs = derive2 { name="revealjs"; version="0.6"; sha256="1pyl20zbsy9m3g0shfv4d4cv7019zxz4329c3l8v3jaqbd1rmlas"; depends=[rmarkdown]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; - rex = derive2 { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[lazyeval magrittr]; }; + rex = derive2 { name="rex"; version="1.1.1"; sha256="0cs13hqv2wb549rhq84psky401pz8r41ia7c0pnyvhxfa2l6zrr8"; depends=[lazyeval magrittr]; }; rexpokit = derive2 { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; }; - rfPermute = derive2 { name="rfPermute"; version="1.9.2"; sha256="1rn61vscxgb0lq86id5sy56sjnfnpapzrpz363cl5x13j7028sjm"; depends=[ggplot2 gridExtra randomForest]; }; + rfPermute = derive2 { name="rfPermute"; version="2.0"; sha256="166zcpz7zdl7rh5dkl1bbsfnpllk7k83r7pkhmfnk92mwn94sx4v"; depends=[abind ggplot2 gridExtra randomForest]; }; rfUtilities = derive2 { name="rfUtilities"; version="1.0-2"; sha256="1hhiyrvz25pf1fxzcmaf8m5c3v57hxv8qvmrk2a87wdsrklh073c"; depends=[randomForest]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfishbase = derive2 { name="rfishbase"; version="2.1.0"; sha256="00q5r3h7s7m6x9vajm1j194g38h6z1c54ndc3044xjp2zkk7l5lp"; depends=[dplyr httr lazyeval tidyr]; }; - rfisheries = derive2 { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[assertthat data_table ggplot2 httr rjson]; }; + rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; + rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="0.1.8"; sha256="1q4c93isdv1cjwb66rr3krpw69anhr5z2pw2z1fgq4v94nr69mf8"; depends=[httr]; }; - rfordummies = derive2 { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; }; + rfordummies = derive2 { name="rfordummies"; version="0.1.2"; sha256="1x4qmjvnzsj0wkzyl1pzaf3b66lhyb4bk72j33bxgr8gb8bzrhp1"; depends=[]; }; rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; }; - rgbif = derive2 { name="rgbif"; version="0.9.0"; sha256="1vz7bkbnp56fxnzlnq6fczmhj9xrc9gldab64pbnszaly90yhv3v"; depends=[data_table ggplot2 httr jsonlite magrittr oai V8 whisker XML]; }; + rgbif = derive2 { name="rgbif"; version="0.9.2"; sha256="1lacxm2dyhqvcvkmfxfzg02wiyp7hmkfi8c4xizxsfv29kr2xphh"; depends=[data_table ggplot2 httr jsonlite magrittr oai V8 whisker xml2]; }; rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; rgdal = derive2 { name="rgdal"; version="1.1-3"; sha256="0ah2qsrz050pbkyijasqc22xvfgsyh0djb8ma3ixfsyrfrflnbpa"; depends=[sp]; }; rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; }; rgeolocate = derive2 { name="rgeolocate"; version="0.5.0"; sha256="0n680a9wnw2xvql0584kqrs22ymj9rr1lbr670j55y6far9pwa0m"; depends=[httr Rcpp]; }; - rgeos = derive2 { name="rgeos"; version="0.3-15"; sha256="1f6nsqpcgbvwjcni9wj8jf4pag79801wiw4ks9gh5kxrc59a165y"; depends=[sp]; }; + rgeos = derive2 { name="rgeos"; version="0.3-17"; sha256="0m05cc7wdswy0p2qdh4zz1p5zm6lwyhdqrkvws0s86zcl4l1z96c"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; - rgl = derive2 { name="rgl"; version="0.95.1435"; sha256="1wmyb7317z4cz5lvv1m53l24dk0p2f0mvmrqhc6q1m811rzzlj54"; depends=[]; }; - rglobi = derive2 { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[RCurl rjson]; }; + rgho = derive2 { name="rgho"; version="0.0.1"; sha256="0zdxq24jrvgl933ww5n0pp9psri99364ibxrvawc42rnv8220gjr"; depends=[curl dplyr httr lazyeval magrittr memoise readr tidyr xml2]; }; + rgl = derive2 { name="rgl"; version="0.95.1441"; sha256="1ryqz7pn9ag35lkpnfhm4w3zahm2j47dyd03h7bcrg535ilr4afn"; depends=[]; }; + rglobi = derive2 { name="rglobi"; version="0.2.9"; sha256="15kc3gb998ryrnpw6nn87vsg63xknchs0hbl33g9napyj5wjmmiw"; depends=[RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.1.1434"; sha256="1483l8gfxnmdps22aiqxnxginc383sj0105bj8d620q9y041625z"; depends=[htmltools htmlwidgets jsonlite knitr magrittr rgl shiny]; }; rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive2 { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; }; - rgr = derive2 { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; }; - rgrass7 = derive2 { name="rgrass7"; version="0.1-3"; sha256="0fqxa5rqpsbpkqgqbq1vnpw1gspwdqjbya5n63anamjyahwnsv5f"; depends=[sp XML]; }; - rhandsontable = derive2 { name="rhandsontable"; version="0.2.3"; sha256="1iij9zw2yicdv981rw6cwv35ih58p54zhnybpfi115fkzfh1x78r"; depends=[htmlwidgets jsonlite magrittr]; }; + rgr = derive2 { name="rgr"; version="1.1.13"; sha256="1l6cf3hmi6mzsqg6dpnw90a6ljhvwar4rjjkamx4mc9hlfsrkggq"; depends=[fastICA MASS]; }; + rgrass7 = derive2 { name="rgrass7"; version="0.1-4"; sha256="0ify8djj3q63xl6d1v4wa7s92rvmraanl8z9l4nd4a59ga09c3s1"; depends=[sp XML]; }; + rhandsontable = derive2 { name="rhandsontable"; version="0.3.1"; sha256="0mwzy5l86fg7wmjd94a4bx8gsqrqyczkx558ggw5izbcj6n44g3k"; depends=[htmlwidgets jsonlite magrittr]; }; rhosp = derive2 { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot permute vegan]; }; - ridge = derive2 { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; }; - ridigbio = derive2 { name="ridigbio"; version="0.3.1"; sha256="1ayga1xlq12a2js7zmb5xqg2hcjslm76j84ynhawwpkx26ilmb0g"; depends=[httr jsonlite plyr]; }; + ridigbio = derive2 { name="ridigbio"; version="0.3.3"; sha256="02cxjnvlr9pk3dyc89xvgppw1mjbi3jahddcsqck4dl6ifb6cj2v"; depends=[httr jsonlite plyr]; }; rinat = derive2 { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; }; rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; - rio = derive2 { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; }; + rio = derive2 { name="rio"; version="0.3.0"; sha256="1drgy70mxy7jn68587h4fwxapjps7iw6d41z02qbq09a4m05py3p"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl urltools XML yaml]; }; rioja = derive2 { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[gdata lattice mgcv vegan]; }; ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; @@ -6484,9 +6788,9 @@ in with self; { rivernet = derive2 { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; riverplot = derive2 { name="riverplot"; version="0.5"; sha256="024i1w08c51bflmw608zizif6419xx40sk6pibnqyjnk74p6y7sm"; depends=[]; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; }; - rivr = derive2 { name="rivr"; version="1.1"; sha256="09xzsqr6f61i9q8pzllrqxv4lq1cp8a8w5bhlzid8fc2m2z6wipd"; depends=[Rcpp]; }; + rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; - rjags = derive2 { name="rjags"; version="4-4"; sha256="0jzjqcmklplnk43p5p5qhgg90cs1ik6vkyz26gmspv9134cji1nz"; depends=[coda]; }; + rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; }; rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; rjstat = derive2 { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[assertthat jsonlite]; }; @@ -6497,43 +6801,44 @@ in with self; { rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; }; - rlist = derive2 { name="rlist"; version="0.4.5.1"; sha256="015iiy989r6www7la2flnqw1967j1m4rip5sn33v1zp1immh40m2"; depends=[data_table jsonlite XML yaml]; }; - rlm = derive2 { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; }; + rlist = derive2 { name="rlist"; version="0.4.6"; sha256="135zh1nrzlsk1rbzjj8al6zf6im9c7zy081ab0igrxlzsjlrama8"; depends=[data_table jsonlite XML yaml]; }; + rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; - rmarkdown = derive2 { name="rmarkdown"; version="0.9.2"; sha256="1bp7g2z991acczidbf214zp5mk5a98mv79gd07hq2mx0145lvydi"; depends=[caTools htmltools knitr yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="0.9.5"; sha256="1zz98jxvw3lzva5kkj1n37gbhjwqd96gjs04y6h37pqy6qmkhk8c"; depends=[caTools htmltools knitr yaml]; }; rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; }; - rmdformats = derive2 { name="rmdformats"; version="0.1.1"; sha256="0y0ax3lap4j5sknxjcm31y72c9baynl8y7vfa7k7rj11p2vp0cil"; depends=[htmltools knitr questionr rmarkdown]; }; + rmdformats = derive2 { name="rmdformats"; version="0.2"; sha256="1rnc9zz5yl0g3085g9akr410f7bwmyban98gr71kj71zabc5vwgq"; depends=[htmltools knitr questionr rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; - rmetasim = derive2 { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; }; + rmetasim = derive2 { name="rmetasim"; version="2.0.4.1"; sha256="03dndby95gvx3qfr2fhgar8vvls3ia2hc2xqlmgh977rgaqs7xd1"; depends=[ade4 ape gtools]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rminer = derive2 { name="rminer"; version="1.4.1"; sha256="1rbs5k3jxjbxr3pdlg03591h8yy9nrg8zjq1kcnvmzgza2a25613"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; }; rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; rmongodb = derive2 { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; }; - rmp = derive2 { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; }; - rms = derive2 { name="rms"; version="4.4-1"; sha256="1b16zw791advrqgpjjw1m291d0lrdf2a4mkp3anh7pjmdaq14n2g"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; + rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; }; + rms = derive2 { name="rms"; version="4.4-2"; sha256="18k7k5k4cy7l76wpdid1lkyjrfg7hs9v6vl6sz3r5y8iag0jklmg"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; - rmumps = derive2 { name="rmumps"; version="5.0.1.4"; sha256="0fcfkycp98f264mrd5cdhiqi0vqj3b6d7zmaffhzkhxa6c675hwn"; depends=[Rcpp]; }; + rmumps = derive2 { name="rmumps"; version="5.0.1.8"; sha256="0awhrb29n8xib9hs6xhy5faz8rndrf29bxldxrwj8hnk2rr4bwvr"; depends=[Rcpp]; }; rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnbn = derive2 { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; }; rncl = derive2 { name="rncl"; version="0.6.0"; sha256="067x05xg7bs271zjhylz3dcd9zan1ycmsh771gn06k9905rr2y71"; depends=[Rcpp]; }; - rneos = derive2 { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; }; + rneos = derive2 { name="rneos"; version="0.3-1"; sha256="00hyaq034d9rf03nwv0myryj3a6is08zn24d3i65kmv9aqicv569"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; rngWELL = derive2 { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.2.0"; sha256="1c8yx4604fdp9w1l3mcscig2206rwgbp43a1h753jpr8cqwdl75l"; depends=[]; }; - rnoaa = derive2 { name="rnoaa"; version="0.5.0"; sha256="0y0cf4k09xgivb0mrbil0h5b4n4p106m04b7gjwvbjanxaliwdhl"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; }; - rnrfa = derive2 { name="rnrfa"; version="0.3.0"; sha256="0wlkja6nwlwm4lqxj2sf3cfr28w1c3h2hwbmlibgcxff9ij3kd99"; depends=[RCurl rgdal rjson sp stringr XML2R zoo]; }; - robCompositions = derive2 { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[GGally MASS pls robustbase rrcov sROC]; }; + rnoaa = derive2 { name="rnoaa"; version="0.5.2"; sha256="08fr1d3nxiy3x1i1kb183nsl6ss5w75crykm54728dkij80jrrm2"; depends=[dplyr ggplot2 httr jsonlite lubridate scales tidyr XML]; }; + rnrfa = derive2 { name="rnrfa"; version="0.5.1"; sha256="0fr8yb5v0grcc55fc3i5sr80b0rm3vbicsy33g6pykgrzdrcppw4"; depends=[plyr RCurl rgdal rjson sp stringr XML2R zoo]; }; + robCompositions = derive2 { name="robCompositions"; version="2.0.0"; sha256="1y7jhvkj6wq4dkjfsl6f5la7kv3fshb02h8diyz4b4wv4yvkzis6"; depends=[cvTools data_table e1071 GGally ggplot2 MASS pls robustbase rrcov sROC VIM]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; }; + robotstxt = derive2 { name="robotstxt"; version="0.1.2"; sha256="15a5k78mc5fpij3cvx8b0qyfglh2x357njm4ryxi230bwvszmqdw"; depends=[httr R6 stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robumeta = derive2 { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; }; robust = derive2 { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models lattice MASS robustbase rrcov]; }; robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; - robustHD = derive2 { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; + robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; robustX = derive2 { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; }; robustbase = derive2 { name="robustbase"; version="0.92-5"; sha256="0wsdgqbkr0amid71q52cij9wnyss2sh1fm75g8cp4d6dndh327rl"; depends=[DEoptimR]; }; robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; @@ -6543,19 +6848,19 @@ in with self; { robustreg = derive2 { name="robustreg"; version="0.1-9"; sha256="1jjydpiz7wwyvivq7vbyrlyf6y9pd036p2xls0kkq7w1d3vpzjwk"; depends=[Matrix Rcpp RcppArmadillo]; }; robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; }; rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; - rockchalk = derive2 { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[car lme4 MASS tables]; }; + rockchalk = derive2 { name="rockchalk"; version="1.8.101"; sha256="1aa0m3whvb190cyfl4177pfd2l1i1a0dz9rn2fxkvls393cssfmb"; depends=[car lme4 MASS]; }; rococo = derive2 { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp]; }; - rodd = derive2 { name="rodd"; version="0.1-1"; sha256="0x7w7v04nqb1gl4h32a674gwc68h6p9pff2piisyd74cgx90sm1b"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; }; + rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; }; rollply = derive2 { name="rollply"; version="0.4.2"; sha256="122c41rqc88ikxws251ddppah18ficir7p00x7wiynqplmhps3nl"; depends=[plyr Rcpp scales stringr]; }; rootSolve = derive2 { name="rootSolve"; version="1.6.6"; sha256="0mn7nxdw1klfay7z12vl3k0ffq3i9p930fyiksjjgy4yz6hljxqx"; depends=[]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; ror = derive2 { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[igraph rJava ROI ROI_plugin_glpk]; }; - rorcid = derive2 { name="rorcid"; version="0.2.0"; sha256="1nymnas4s7nwajii0iwyv5azwkp5sfx95m60is161zqm6zxyniaw"; depends=[httr jsonlite]; }; + rorcid = derive2 { name="rorcid"; version="0.2.2"; sha256="0jnvc04br702027y3dhhjckd94lidvsj937cv5lvpb7fd8ahmx7z"; depends=[httr jsonlite]; }; rorutadis = derive2 { name="rorutadis"; version="0.3.1"; sha256="06s2cnfhs4hffd2bzqp6542fqw37ha63d5sc25j9ch3ih42ja3cg"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; rosm = derive2 { name="rosm"; version="0.1.3"; sha256="0a9shin62zlpc752jhyg72cshc7wwz6cp4br64ra4h86xdlwi3c4"; depends=[abind digest jpeg png rgdal rjson sp]; }; rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; }; - rotations = derive2 { name="rotations"; version="1.4"; sha256="0snnzjbp5sxd8ijv9ams4jyhsd8s47kdbkkf34iv3ppibjdzrri5"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; - rotl = derive2 { name="rotl"; version="0.4.1"; sha256="1f5x2adlv7fbz0w4bwc7q69wq20rlx5scyzl1immkxgs27was4l1"; depends=[ape httr jsonlite rncl]; }; + rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; + rotl = derive2 { name="rotl"; version="0.5.0"; sha256="0na3x13d2n5fahyxj5jp4v3j3clrcr6m9g4cig9d5dk6dhp3iv9d"; depends=[ape assertthat httr jsonlite rncl]; }; roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; rowr = derive2 { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; }; roxygen2 = derive2 { name="roxygen2"; version="5.0.1"; sha256="19gblyrrn29msbpawcb1hn5m1rshiqwxy0lby0vf92rm13fmsxcz"; depends=[brew digest Rcpp stringi stringr]; }; @@ -6567,13 +6872,14 @@ in with self; { rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; - rpdo = derive2 { name="rpdo"; version="0.1.0"; sha256="032wnq520njhd80v1dhhv44f0c0hdpi5dsra9yisvvgbsfi9vnd7"; depends=[]; }; + rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; + rpdo = derive2 { name="rpdo"; version="0.1.1"; sha256="0kq53mlr6i65s8lqj5nk8nvadqxd8hw4rx1vg8c6p5kvnl6pmawn"; depends=[]; }; rpf = derive2 { name="rpf"; version="0.51"; sha256="0hsghv26jbv3alvyrh9bkgx97mjbvd21zjv9n1q63d6d3drxc6rc"; depends=[mvtnorm RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; }; rphast = derive2 { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.7"; sha256="1qqx417bgf5dcbvssp7y8b5zz66ipwdpv18pgndj92rx53h81g18"; depends=[htmlwidgets]; }; rplexos = derive2 { name="rplexos"; version="1.1.4"; sha256="1q9vlxhglmrwxh9g4wq98nc321kq7jhgkykp9hwl3bd26a1jcfjp"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; }; - rplos = derive2 { name="rplos"; version="0.5.4"; sha256="05849f29km726qr1ksczqpa3acr76bn5v6kxk06zakj7s5k74drh"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; }; + rplos = derive2 { name="rplos"; version="0.5.6"; sha256="0h8k2di868h49hxwww8nz093viqfd48q3jhmlk33yfgs44sm20hj"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; rpnf = derive2 { name="rpnf"; version="1.0.4"; sha256="0cpn23qngjx6m33f3kwflabxdhs06r2mnlh9a6adw4fvvizxnki4"; depends=[]; }; rportfolios = derive2 { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; @@ -6581,49 +6887,55 @@ in with self; { rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[car RCurl RJSONIO XML]; }; - rqPen = derive2 { name="rqPen"; version="1.2"; sha256="184vk1yp2ni2mnrivrsqiyjm9wnwf1a41p6p13mxyv02x80gz8qm"; depends=[quantreg regpro]; }; + rqPen = derive2 { name="rqPen"; version="1.3"; sha256="1hm4nh9afjwa601qysbjl6ipbal5rmmr8z5nn3f9bxd5nlgwzm0r"; depends=[quantreg regpro]; }; rr = derive2 { name="rr"; version="1.3"; sha256="00m5h01j3qb83s7bcjp4xx6pf16hjjhl0qryb929cnxn1ln0ddns"; depends=[arm coda MASS]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.4"; sha256="0h0mqfb524kglaibgj4d0g05lrnzgz6x87irs31dwl28j4kxcz4w"; depends=[]; }; rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; - rrcov = derive2 { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; }; - rrcovHD = derive2 { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[pcaPP pls robustbase rrcov spls]; }; - rrcovNA = derive2 { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[cluster lattice norm robustbase rrcov]; }; + rrcov = derive2 { name="rrcov"; version="1.3-11"; sha256="0ixn2ly8p5wkdbd1fmpa0p22jxvmxiigpii4ia8vnhjnclm7jmin"; depends=[cluster lattice mvtnorm pcaPP robustbase]; }; + rrcovHD = derive2 { name="rrcovHD"; version="0.2-4"; sha256="020d9ip91azprr4hf5k2gyhlv6g6zkzmaa22fysq3hyacxymksib"; depends=[pcaPP pls robustbase rrcov spls]; }; + rrcovNA = derive2 { name="rrcovNA"; version="0.4-8"; sha256="1xhzy0gyiwhaklq1b9arxqpljfz08bwlhjw7xsjz7zjb650y3rw8"; depends=[cluster lattice norm robustbase rrcov]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; + rredlist = derive2 { name="rredlist"; version="0.1.0"; sha256="1ivxmb0jwwip7s4gglw4v4wsfzird7gvll8zcgpvwsi3mj5jqibp"; depends=[httr jsonlite]; }; rrepast = derive2 { name="rrepast"; version="0.3"; sha256="133ip1fxj8z76v0ny02mw7wbqjsmqsxbha6zsi4db4cxnilq8hai"; depends=[digest lhs rJava xlsx]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[eha mc2d msm tkrplot]; }; rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="1.0.8"; sha256="106gwgfxsvs6npcmzl5yjx1kq6cpqjp7prcx15cx6sq3hj057h1i"; depends=[]; }; + rscala = derive2 { name="rscala"; version="1.0.9"; sha256="024k3jivl2zvwnlamlsc34bqw7v0rj1psvypykq6lls60frr9cg8"; depends=[]; }; + rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; + rsconnect = derive2 { name="rsconnect"; version="0.4.2"; sha256="04j2826264nvgwlbi68827cn3gah97bwmxn6yxrdpa4j1khmnj7g"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; rscopus = derive2 { name="rscopus"; version="0.1.2"; sha256="178ymgywq7fmv8gicrkhcqw40f6wxiqq6zhlc1zilcr0rf6lvx6x"; depends=[httr]; }; rscproxy = derive2 { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.5-0"; sha256="1s1yqa1f999df10hhpgw4dq68a2rx5jx69p0zj897ncag8zapzhb"; depends=[plyr RCurl XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.5-3"; sha256="13wdzpyv15p4a92lclb6jg3lm1hnyaa8wqnngm1qyam3dhwfi9k0"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; }; rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; }; rsm = derive2 { name="rsm"; version="2.7-4"; sha256="0j520dhklfbd9mh90181lxjsvasgyc0zzi6z6ahybwhffwqczz42"; depends=[]; }; - rsml = derive2 { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[rgl XML]; }; + rsml = derive2 { name="rsml"; version="1.3"; sha256="0a1y41jq0yzr19mb2scwhlp9gx5vngm4q12yxp1fcwk2cqhnsda6"; depends=[rgl XML]; }; rsnps = derive2 { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; }; rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; - rstan = derive2 { name="rstan"; version="2.8.2"; sha256="1x1si0jfzay67yh1pygxzfz0pcb8xd2m5xbg5slb3syzi8xf7908"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; - rstatscn = derive2 { name="rstatscn"; version="1.0"; sha256="12anzir788j6nf2za1bkwxksnhb0khc8cml5bxdracgfd35nv77q"; depends=[httr jsonlite]; }; + rstan = derive2 { name="rstan"; version="2.9.0-3"; sha256="0ps6a9fqvrm6p8s5g10373hfqrx58vmvg1w4rghz5v8wshjc9ij4"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.9.0-3"; sha256="0sh1xv0848c0sil1qrjdn8hgv2hr40nmz4knz63mnr3i5j8fzy00"; depends=[BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan shinystan StanHeaders]; }; + rstatscn = derive2 { name="rstatscn"; version="1.0.2"; sha256="0gq4ybymlpvzr5gkxlc877jwczh034b5gxmzhy8pcqhai6jsq42y"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; - rstpm2 = derive2 { name="rstpm2"; version="1.2.2"; sha256="0mmawy16b8yvzm8d5rx3dbchs7ybr2s5v6clqg88jkrff7141i7m"; depends=[bbmle mgcv numDeriv Rcpp RcppArmadillo survival]; }; + rstpm2 = derive2 { name="rstpm2"; version="1.3.1"; sha256="0fflgp17gfav7q7yv3x1g74s9r5fhzr52mrmjl9p6hc7q6m2frzl"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.4"; sha256="1sgwk9mh3v3vv8gm537hfng6p2sqafd9ykraiw00s0z60fa80jnx"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.4.0"; sha256="0r229x6hj01xzgi64rgnlrl2h6q3vrj7cfhx4sbj76ig2k5gzhpi"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.5"; sha256="0sgnqfx0m3hzh57k10s7ndrbw7yqjjjcgfikafya98jcc7wmpwym"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; }; rsvd = derive2 { name="rsvd"; version="0.3"; sha256="0439s19fn01iihsapzzbmq72v4brsmqypxgdhxswhj9qq3y8ikhc"; depends=[]; }; + rsvg = derive2 { name="rsvg"; version="0.5"; sha256="0db0s3flyl1w1wzr9pbnpakz1zi1ssh4mgjpspkjphpqahix27qa"; depends=[]; }; rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; rtdists = derive2 { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd gsl msm]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; rtf = derive2 { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; }; rtfbs = derive2 { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; }; + rticles = derive2 { name="rticles"; version="0.1"; sha256="17fbwarchnxvbk2fsb2hyifdhnaj05pl5ia32j5yd7pyi848mpvv"; depends=[knitr rmarkdown yaml]; }; rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; }; rtimes = derive2 { name="rtimes"; version="0.3.0"; sha256="141i8zjsdzk7jdjf9wf3pa6d9ixjg1m4chk44iznmjpig4gbq2n9"; depends=[dplyr httr jsonlite]; }; rtkore = derive2 { name="rtkore"; version="1.0.1"; sha256="0wk3v7xzmkmmag09dc08812g75a129ycn1107hvzqcpqlwma3n2n"; depends=[Rcpp]; }; @@ -6645,10 +6957,11 @@ in with self; { rversions = derive2 { name="rversions"; version="1.0.2"; sha256="0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"; depends=[curl xml2]; }; rvertnet = derive2 { name="rvertnet"; version="0.4.1"; sha256="1x24l83m00rd10hcy2mnzpwlkpk92zfw3gcxiwghpijy04azkiy9"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; }; rvest = derive2 { name="rvest"; version="0.3.1"; sha256="12mh9jbfy6ykx89kb475gk99i0jaxja6jk7pd6d9iz0kbfywnm7f"; depends=[httr magrittr selectr xml2]; }; + rvg = derive2 { name="rvg"; version="0.0.8"; sha256="0dbqzaxhabq0qn6clj46mb6a9cawz3pkmnksrhqbslq7x2y5wcp8"; depends=[gdtools R_utils Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rwirelesscom = derive2 { name="rwirelesscom"; version="1.4.3"; sha256="1q4s9m9k6i7x2vq5dwq7950sbq03i8ff6qk8l30x77689kpflqcb"; depends=[ggplot2 Rcpp]; }; - rworldmap = derive2 { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[fields maptools sp]; }; + rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; }; rwunderground = derive2 { name="rwunderground"; version="0.1.0"; sha256="10m0wgym6rdrgvmhh79q4jf0lh8wlrg04mvq0yvgnqfgcxn4rmir"; depends=[countrycode dplyr httr]; }; @@ -6656,17 +6969,17 @@ in with self; { rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; rzmq = derive2 { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; }; s20x = derive2 { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; }; - s2dverification = derive2 { name="s2dverification"; version="2.4.0"; sha256="18jj1b2a20x2yzcldjl571m42swrbj8md9hxlkdbgmv4w0zj27d1"; depends=[abind bigmemory GEOmap geomapdata mapproj maps ncdf4 plyr SpecsVerification]; }; + s2dverification = derive2 { name="s2dverification"; version="2.5.0"; sha256="1d8ydjgrrqxg29f5sdngch1l1zlg7bsrv04702v46x8x98521mc4"; depends=[abind bigmemory GEOmap geomapdata mapproj maps ncdf4 plyr SpecsVerification]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; }; sGPCA = derive2 { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; }; sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; - sSDR = derive2 { name="sSDR"; version="1.0.0"; sha256="0s7r7brvdxscz5gnkhari26m5k2z0i0azw4gc6ani25bp4cy5m83"; depends=[MASS Matrix]; }; + sSDR = derive2 { name="sSDR"; version="1.1.0"; sha256="0f8j1m4j6y8pppaw05naharfqlzb5y8d9db29fi86pm7w1x49511"; depends=[MASS Matrix]; }; sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; }; sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; - sadists = derive2 { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; }; + sadists = derive2 { name="sadists"; version="0.2.2"; sha256="1w42j0g3yi3mqamkl9z3v103vv2hy2l1cy5ijbam0yddsaqqig3b"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.2.4"; sha256="15kszjlqz3rzxfmsfd8zbl6hx40z9j5drzyvac1h244dhrms6lal"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; }; sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; @@ -6701,37 +7014,40 @@ in with self; { sca = derive2 { name="sca"; version="0.9-0"; sha256="1xqdcxxsrsl8v2i8ifqcgb38vayz8ymay2sw4m9hmpma54a6r9j5"; depends=[]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; - scales = derive2 { name="scales"; version="0.3.0"; sha256="1kkgpqzb0a6lnpblhcprr4qzyfk5lhicdv4639xs5cq16n7bkqgl"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; }; + scales = derive2 { name="scales"; version="0.4.0"; sha256="19y6q4j8vpmc73dnn4ncp5wj44gri7m77ys3z2rn3crrcc9zc7l5"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; }; scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; }; scam = derive2 { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmqalfh5f26b5n36saaizm4a12wyf"; depends=[Matrix mgcv]; }; scape = derive2 { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; - scatterD3 = derive2 { name="scatterD3"; version="0.5.1"; sha256="0fm54xblxgn4758488kg5sd7rg3bxfngrzhpfa4f0j6vh2qn5xpq"; depends=[digest htmlwidgets]; }; + scatterD3 = derive2 { name="scatterD3"; version="0.6.1"; sha256="1d42fd2rzk5vgz7d971zv5f2yxm5zsy4awax9qzm9hdm5mf241c5"; depends=[digest ellipse htmlwidgets]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-36"; sha256="0bdxfdw23921h3rbpq0y4aixplzpkk95wgm2932kh0x7a4bnhswh"; depends=[]; }; + scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; schoRsch = derive2 { name="schoRsch"; version="1.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; }; scholar = derive2 { name="scholar"; version="0.1.4"; sha256="088clkpllpjv9rjb45v46dga4ig11ifvfyclgfgcgqvxy5cn92jr"; depends=[dplyr httr R_cache rvest stringr xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; - schumaker = derive2 { name="schumaker"; version="0.1"; sha256="0jfiy6xhq1mn9ad85g2liqf9m4png4yanxgca5lkpvzncp7jj8f3"; depends=[]; }; + schumaker = derive2 { name="schumaker"; version="0.3"; sha256="0y2jyy3za7xi8l9kc0z35mqc7a29lbxmaqgax8frljmqsnwkwwhp"; depends=[]; }; schwartz97 = derive2 { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; }; scidb = derive2 { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[digest iterators Matrix RCurl zoo]; }; scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; sciplot = derive2 { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; }; + sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; scmamp = derive2 { name="scmamp"; version="0.2.5"; sha256="1i0fkmpkdjbjwvh1y4synplafvcx9bjyf8i856sm5i3kjyh6vx46"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorer = derive2 { name="scorer"; version="0.1.0"; sha256="1qbcbhymagaqpcbysj33ncjz1kxg9ig0anrv7pl8s8m2kpqn4vmb"; depends=[]; }; scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; }; scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; scriptests = derive2 { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; }; + scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; }; scrypt = derive2 { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; }; + scs = derive2 { name="scs"; version="1.1-1"; sha256="1qx8b73g5v7mjx85lx5bln6j6i9r7m238i7hm8adr2jrbl33532y"; depends=[Matrix]; }; scuba = derive2 { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; }; sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; sdcMicro = derive2 { name="sdcMicro"; version="4.6.0"; sha256="0j6adz04smp8pbg62w7hyqp2wl1cqazmxf4vnvb4jxcqw69qxd74"; depends=[car cluster data_table e1071 ggplot2 knitr MASS Rcpp rmarkdown robustbase sets xtable]; }; sdcMicroGUI = derive2 { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; }; - sdcTable = derive2 { name="sdcTable"; version="0.20.1"; sha256="05hkqd65fn6inf506kcjjxdjapvjbgidqcgsad1d7a6zv8lfh4fp"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; }; + sdcTable = derive2 { name="sdcTable"; version="0.20.3"; sha256="03ljsk1y1l0771ika013qgdm3zd3q60lxc2a11dnaglnz4pmvyx1"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; }; sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive2 { name="sde"; version="2.0.14"; sha256="1j4lvbc4f78dkz7fkwb07498a0xnnz0xrszgmhz80s2fvc1c5djs"; depends=[fda MASS zoo]; }; @@ -6747,9 +7063,9 @@ in with self; { searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; seas = derive2 { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; season = derive2 { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; }; - seasonal = derive2 { name="seasonal"; version="1.1.0"; sha256="13fsf3n6qk59c55320c9qhac8p02xiyn8j38bpiamdrnzax7v9d5"; depends=[]; }; + seasonal = derive2 { name="seasonal"; version="1.2.1"; sha256="0y85z9rgqyzfry8ak5bi565jhkfks1xd2zhjyh63p823cyjln6cf"; depends=[x13binary]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="2.10.0"; sha256="0vzdpp9i3hvaklz4k201i0s7cw9cgspr3g5pf1jnb2d3ld3dq5rs"; depends=[abind MASS mgcv nlme raster sp]; }; + secr = derive2 { name="secr"; version="2.10.2"; sha256="14l284qhnic7ng6zpnnfxqk4gxlmx9xlfb675k5691x2bdy4z8gx"; depends=[abind MASS mgcv nlme raster sp]; }; secrdesign = derive2 { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[abind secr]; }; secrlinear = derive2 { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[igraph maptools MASS secr sp]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.0.0"; sha256="15dgq7bc71y5jykvpzpwbjxcw3jjh9vf12pwyaizhkb5fkyrjjmf"; depends=[jsonlite RCurl]; }; @@ -6762,10 +7078,11 @@ in with self; { segmented = derive2 { name="segmented"; version="0.5-1.4"; sha256="1740cvx2q4v23g4q0zkvg50s5bv8jcrlzzhm7fac4xn0riwmzp5i"; depends=[]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp]; }; - sejmRP = derive2 { name="sejmRP"; version="1.2"; sha256="00dmrjvdimzvj11f4v3lw2sips1x5pxxkdnv9khm1qki8pqc9jw9"; depends=[DBI dplyr RPostgreSQL rvest stringi XML xml2]; }; + sejmRP = derive2 { name="sejmRP"; version="1.3"; sha256="0qrlzanmqqqwsb83rh2wys4jl2mz1ijwznnx32i2gk4h1nvkwxbx"; depends=[DBI dplyr RPostgreSQL rvest stringi XML xml2]; }; selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; }; - selectiongain = derive2 { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; }; - selectiveInference = derive2 { name="selectiveInference"; version="1.1.2"; sha256="0c6h0di1vazrrhxb6syz5rcnz8wz4cy9b7aylqxph07r4jm7x5hh"; depends=[glmnet intervals]; }; + selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; }; + selectiongain = derive2 { name="selectiongain"; version="2.0.50.1"; sha256="025y0g5jj416k1a71jxwyr69cza6xvfq3gv3lv3m7i3sbd4bsmaj"; depends=[mvtnorm]; }; + selectiveInference = derive2 { name="selectiveInference"; version="1.1.3"; sha256="0f173mzijw34f9m7xqljv1pczk8pvqlwmi30p6i0zld6amg6h76s"; depends=[glmnet intervals]; }; selectr = derive2 { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; }; selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; }; selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; @@ -6774,7 +7091,7 @@ in with self; { semGOF = derive2 { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[colorspace corpcor igraph lavaan lisrelToR plyr qgraph rockchalk sem XML]; }; - semTools = derive2 { name="semTools"; version="0.4-9"; sha256="1fiw6ajksbzsvrfs5wq7l4bwnp8jd068w6ifklv3jwsbyqa4lvkf"; depends=[lavaan]; }; + semTools = derive2 { name="semTools"; version="0.4-11"; sha256="00b695ylgx9r5rxaq6zg05nk99kzr00sw379dxr6mar0kpazy4qn"; depends=[lavaan]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semiArtificial = derive2 { name="semiArtificial"; version="2.0.1"; sha256="1bjjqcm6r3hxj5752ywdzllh7wr4rwzqlrkf50wpdl05za3fbfd9"; depends=[cluster CORElearn dendextend fpc ks logspline MASS mclust nnet robustbase RSNNS timeDate]; }; semisupKernelPCA = derive2 { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; }; @@ -6787,12 +7104,12 @@ in with self; { sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; - sensory = derive2 { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[gtools MASS Matrix]; }; + sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; - seqHMM = derive2 { name="seqHMM"; version="1.0.3-1"; sha256="008yq4gin9znqm0rf9rvlk7xldjb62n5xkwvr6qcbz3k1bxb4gsm"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; - seqMeta = derive2 { name="seqMeta"; version="1.6.0"; sha256="1ha6vsaapac6p18r5df2z39vzsb9qr6kyb9g6h53km588zk280zl"; depends=[CompQuadForm coxme Matrix survival]; }; + seqHMM = derive2 { name="seqHMM"; version="1.0.5"; sha256="0dy0iiijfnsq7i49hj2vc7j8n1d823laa63q6pkrjni9fb4xw9v8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; + seqMeta = derive2 { name="seqMeta"; version="1.6.5"; sha256="0ws6xa1bcibg49vax4in9gc1pvf19ggf95nfy0qr3pp5fpbqw29d"; depends=[CompQuadForm coxme Matrix survival]; }; seqPERM = derive2 { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; seqinr = derive2 { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; }; @@ -6800,9 +7117,10 @@ in with self; { seqmon = derive2 { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; }; - seriation = derive2 { name="seriation"; version="1.1-3"; sha256="0gz10qzxvzp9ah86qq09wpa77qgp3qi7yjm7fx19p3n6pzikkgql"; depends=[cluster colorspace gclus gplots MASS qap registry TSP]; }; + serial = derive2 { name="serial"; version="1.1"; sha256="06qmvkmgp04izq8dr6ky44dfr3z3cv1c9dxkalv57qxccshkc1xq"; depends=[]; }; + seriation = derive2 { name="seriation"; version="1.2-0"; sha256="0krbrv9f0lw5vjcfjnak541c4hmyvqwkvqdlrgiapmwhl6lp6z9s"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; }; - servr = derive2 { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[httpuv jsonlite mime]; }; + servr = derive2 { name="servr"; version="0.3"; sha256="1p85ii0w3fydsjqg8mrrg972qmrdrw1a1kbgpikq4w40vxp33szl"; depends=[httpuv jsonlite mime]; }; sesem = derive2 { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; @@ -6811,42 +7129,44 @@ in with self; { setwidth = derive2 { name="setwidth"; version="1.0-4"; sha256="0i565phbfj0rff13nyz6sy8cn4cch4fcjfgkns3z6c94w11b4703"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; - sfsmisc = derive2 { name="sfsmisc"; version="1.0-28"; sha256="0fa4blrlgwdnj8wgv1h7c143r3g9rnnsnnrlgxa8inmajb1ck07b"; depends=[]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-0"; sha256="0580piv4n1nispl3pa8nfjjfnb8iwaqky2dzdy0aqnxrxgrhqhvz"; depends=[]; }; sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; }; sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; - sgd = derive2 { name="sgd"; version="1.0"; sha256="1ljv7rr65h81n8z35vdcbqp0dfbqlginc6xn9jmpidn20gkxlj1w"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; - sgeostat = derive2 { name="sgeostat"; version="1.0-26"; sha256="0srsly6a3rraczshqqfmpwqz3459yxbsr70d4lz8b0kvflhds7p3"; depends=[]; }; + sgd = derive2 { name="sgd"; version="1.1"; sha256="1kqpaxyacaq1fkmy4hsj62167gcmqng4pmafpdjdpqxwdqxz9xxf"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; + sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; sglOptim = derive2 { name="sglOptim"; version="1.2.0"; sha256="06a70q7i93pyyadqngg1qd0kz52m73fpqlji6jxsiyixajcqn2q5"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgof = derive2 { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; + shades = derive2 { name="shades"; version="0.1.0"; sha256="164m4xm63swp1b1kr86i4nnja79kfhzd3pyc1qwyby838brkm5aj"; depends=[colorspace]; }; shape = derive2 { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive2 { name="shapes"; version="1.1-11"; sha256="1zxckrl4pc6ppdbhp5h5ib4yp7iw7z3kciqibrijvbvjpkl1fl35"; depends=[MASS rgl scatterplot3d]; }; sharpshootR = derive2 { name="sharpshootR"; version="0.9.1"; sha256="01qczwyh6gpw26qg77r5f9nrmfjd1glcbdxwvx0bdfa5j6m31iq4"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; - sharx = derive2 { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[dclone dcmle Formula]; }; - shiny = derive2 { name="shiny"; version="0.12.2"; sha256="0hdgvqsg0s7va55z2pf76898fslcnghpcjvwsqlfw2q441h7dkh9"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; }; - shinyAce = derive2 { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; + sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; + shazam = derive2 { name="shazam"; version="0.1.2"; sha256="16n7l02sm9jyvag43y048ga7p3zpsfhmh7ar4759r68zc14sgj9k"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 iterators lazyeval scales SDMTools seqinr stringi tidyr]; }; + shiny = derive2 { name="shiny"; version="0.13.1"; sha256="0lz57iv0xv8j2iczwznkypb5syjh5rk6lnyp92icphz4qmbcpkaa"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; }; + shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[htmltools RJSONIO shiny]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; shinydashboard = derive2 { name="shinydashboard"; version="0.5.1"; sha256="1p417ngxw9bk90kgz6n8f23w360knjdg6kkvrbarf7s91wfc8wcb"; depends=[htmltools shiny]; }; - shinyjs = derive2 { name="shinyjs"; version="0.3.0"; sha256="1vgavalwp6brs9664p7zpg4bjg5rqgv5zixmwgymz2y780ghc959"; depends=[digest htmltools shiny]; }; - shinystan = derive2 { name="shinystan"; version="2.0.1"; sha256="0rjqawyv2gpwdz75nnwzxi93fjx2vfvxv14ihhmhz8zly3pjaadc"; depends=[DT dygraphs ggplot2 gridExtra gtools markdown reshape2 shiny shinyjs shinythemes threejs xtable xts]; }; + shinyjs = derive2 { name="shinyjs"; version="0.5.0"; sha256="1p3l58cggf0cpdp7brsqz5ailk8w50d0v8z3zy5rm7351mzj3l07"; depends=[digest htmltools miniUI shiny]; }; + shinystan = derive2 { name="shinystan"; version="2.1.0"; sha256="1z97sjc4414rvxyghl30501bc60dshn8msj8k9wxaz5mby7yafbh"; depends=[DT dygraphs ggplot2 gridExtra gtools markdown reshape2 shiny shinyjs shinythemes threejs xtable xts]; }; shinythemes = derive2 { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; }; - shotGroups = derive2 { name="shotGroups"; version="0.6.2"; sha256="1hk511lbf5w3k0sjkb75q1fvryyn9a1j69jzv75fvwjsjvmykd14"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; + shotGroups = derive2 { name="shotGroups"; version="0.7"; sha256="0zvwf87xm9dmi10i700nx8qgg314iy6dwd5kv0ziinprma7ivvjv"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showtext = derive2 { name="showtext"; version="0.4-4"; sha256="14xvbvch354dwbhr36ih4av9b7f3z2zw2bsbnn5fxxh15lm26wz3"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[igraph maptools]; }; - shrink = derive2 { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[MASS rms survival]; }; + shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; shuffle = derive2 { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; }; siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; }; siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; }; @@ -6857,52 +7177,53 @@ in with self; { sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; }; signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; }; - signalHsmm = derive2 { name="signalHsmm"; version="1.3"; sha256="0hx389ibk473mfycc8sj96ppz9hri4x9ni05fv32zvzxy8b9i9jv"; depends=[biogram Rcpp seqinr shiny]; }; + signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPH = derive2 { name="simPH"; version="1.3.5"; sha256="1k2gs8lls287g3zy94h231sf9nljygmb82m4yjc05xglsi8ab0dr"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; - simPop = derive2 { name="simPop"; version="0.2.15"; sha256="1dx7xjd7zqp7gv84vl5mm8wiv0mg1wlsx68gmz68j39a4g45yr0q"; depends=[colorspace data_table doParallel e1071 foreach laeken lattice MASS nnet Rcpp vcd VIM]; }; + simPop = derive2 { name="simPop"; version="0.3.0"; sha256="0rxlabgdjcbqldk06lzl81fi35qg6s9dw73h3bbwd7x89cbj5q8x"; depends=[colorspace data_table doParallel e1071 foreach laeken lattice MASS nnet party plyr Rcpp vcd VIM]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive2 { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; }; - simcausal = derive2 { name="simcausal"; version="0.4.0"; sha256="1f533y80bp1svxcbxw8lggp2jr3s6ifk5gpd0d7cgn6cdshvcy5y"; depends=[assertthat data_table Matrix R6 stringr]; }; + simcausal = derive2 { name="simcausal"; version="0.5.0"; sha256="0aqgz09l3ixhmz8k1cfy6185pybxl5ickvz0d3r7il7izsyrwnmv"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; simctest = derive2 { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; }; simecol = derive2 { name="simecol"; version="0.8-7"; sha256="0p6kmv65k3zy5q4v8casc2cp3c2ckblmycd1y1nnn7z7fnd57g8h"; depends=[deSolve minqa]; }; simest = derive2 { name="simest"; version="0.2"; sha256="15cgm8nk41fnva2camq26dwb1xy8qyk68v4918xszkj25lxb01m3"; depends=[nnls]; }; simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; - simmer = derive2 { name="simmer"; version="3.1.1"; sha256="08j9lvbqf8vnvp84blzxhjn5hrx2kahji6nnnrqz22lxn223lrpm"; depends=[BH magrittr R6 Rcpp]; }; - simmr = derive2 { name="simmr"; version="0.2"; sha256="0g83icm98aavdvvi5fcxnka4lbs9c39sqm32n2w5405ywpv9w8nl"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags]; }; - simone = derive2 { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; }; + simmer = derive2 { name="simmer"; version="3.1.2"; sha256="0zxvczxvpi20d4q6vpyiwz4xh5akwlbris5m86nq2s6wzccnmsjb"; depends=[BH magrittr R6 Rcpp]; }; + simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; }; + simone = derive2 { name="simone"; version="1.0-3"; sha256="1l38xbcf50kjh0k4dc4xsxkjr54jz4s98az99mzcsdarqd6kz9kg"; depends=[mixer]; }; simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; + simpleRCache = derive2 { name="simpleRCache"; version="0.2.2"; sha256="1hbiwk2am56f2vhj5qvajkqwynlch7c857vnpj99497wgy2wxg7z"; depends=[digest]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; simplexreg = derive2 { name="simplexreg"; version="1.1"; sha256="0iyrkynhrkdix27r105wv0yn5yc8cgrf6hlv4byi9mz6y05f9i7p"; depends=[Formula plotrix]; }; simplr = derive2 { name="simplr"; version="0.1-1"; sha256="14gv2cwygjjfc9yjdrcn68scgyh469kypmf4mqy5p18gsxfj3h1c"; depends=[]; }; - simr = derive2 { name="simr"; version="1.0.0"; sha256="14afhchh01aavxy629qmlnqd50phfm1x5mksskigsrhanjxxpaln"; depends=[binom iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; + simr = derive2 { name="simr"; version="1.0.1"; sha256="1n7x5q6bwpw7k3bfmc736f37flg5xmiwmaz52w3ayabwljkirbrn"; depends=[binom iterators lme4 plotrix plyr RLRsim stringr]; }; simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; - simsalapar = derive2 { name="simsalapar"; version="1.0-8"; sha256="015xqgbzkbhklazkxsdwi4qd4i93a9hzwv4ibikmgg4nlcm163zf"; depends=[colorspace gridBase sfsmisc]; }; - simsem = derive2 { name="simsem"; version="0.5-11"; sha256="0k93wck82wpxrckf7g8x7iik0134wmz5n8y2d086lb24ic2231zz"; depends=[lavaan]; }; + simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; }; + simsem = derive2 { name="simsem"; version="0.5-12"; sha256="12zwc7h2rmj0nbrrwd1s70iicf0vs3ld7dn3aq6wda71vgplgc14"; depends=[lavaan]; }; sinaplot = derive2 { name="sinaplot"; version="0.1.3"; sha256="007f7zqyg48n8v2lwa6ff8cwbvi332cg40fmzlvr3jjms0gsrzbr"; depends=[ggplot2]; }; - siplab = derive2 { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; + siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-1"; sha256="12gnlfbnis5972p4v5ad16srfsfrr0kji40y8jbygcd43f8ka70r"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="1.9-0"; sha256="1cmnar2ssn4l5yy002fwd3ckwqd9l017aakdavm8xy0s62aqxhzb"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; }; + sirt = derive2 { name="sirt"; version="1.10-0"; sha256="0s3bkvxc7liclggwcbmr28smh6lbcp8zd2c4qad6f8sbi30bj4l2"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.2"; sha256="03lnk0p97nf4a8rw8ypy3xfzj4idwm00a0gfrkiwb7xq606sl0vb"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; }; - sitar = derive2 { name="sitar"; version="1.0.3"; sha256="194jyd93h811bvscxklx5cm3vjk9xl8ixmrim49nzrwckdrzfnm0"; depends=[nlme quantreg]; }; + sitar = derive2 { name="sitar"; version="1.0.4"; sha256="1kppy6ryzf0mbdwnxwg1syjbnbymbpldcwxki6h213h7pd1gjbn9"; depends=[nlme quantreg]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; - sivipm = derive2 { name="sivipm"; version="1.1-2"; sha256="0rqmmcpaxjv5dx58jfp3z24w8pddfymic782pjrgn2hxiz8yxm4s"; depends=[seqinr]; }; - sjPlot = derive2 { name="sjPlot"; version="1.8.4"; sha256="11jqvf0hr0b4ywvpmcxfipcvqclr0yqhx9yrr4axzqd2j7zc7pjh"; depends=[car dplyr ggplot2 magrittr MASS psych scales sjmisc tidyr]; }; + sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; }; + sjPlot = derive2 { name="sjPlot"; version="1.9.2"; sha256="15nsaxflpkh5njzn6j0hwsrg1ar0zjjwksvwlm4cf33c3a9zgk9v"; depends=[car dplyr effects ggplot2 lme4 magrittr MASS nlme psych scales sjmisc tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; - sjmisc = derive2 { name="sjmisc"; version="1.3"; sha256="08q3pczrkpl6kr8bc8jzgaifr0s4h0s7z69vvgivxa681jyrza25"; depends=[haven MASS]; }; + sjmisc = derive2 { name="sjmisc"; version="1.6"; sha256="0h1w4il1bj9kw0lx1hjlz60d1m92d9bhrgwg3sz4arizh88j83mf"; depends=[coin dplyr haven lme4 MASS Matrix nlme stringdist tidyr]; }; skatMeta = derive2 { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[CompQuadForm coxme Matrix survival]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.1.3"; sha256="1w46ri4k8xg07phl7j4cb5b3qndplr027n047wzc15xcjliggg89"; depends=[]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skmeans = derive2 { name="skmeans"; version="0.2-7"; sha256="007069ikrqcjj7yh4xc3jx85rj38av817lhmcw9gdnz7d0dr5h06"; depends=[clue cluster slam]; }; + skmeans = derive2 { name="skmeans"; version="0.2-8"; sha256="0g5hyb1zwjp45j4wqbssdr0mw9fr19b6a35bmsf6xsgbf5asqx6w"; depends=[clue cluster slam]; }; sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; }; slackr = derive2 { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; }; slam = derive2 { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; }; @@ -6913,7 +7234,7 @@ in with self; { sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.2-4"; sha256="1rp0hib79x1rf2v5h1d2gp6ixq7r8v33qy5bz5sfphi94xwasm7l"; depends=[]; }; smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; - smacof = derive2 { name="smacof"; version="1.7-0"; sha256="0fs7k8nn9dsw3nx10gjlmpfn76rdwmydyx65zvd6li65991i7yap"; depends=[colorspace Hmisc nnls polynom]; }; + smacof = derive2 { name="smacof"; version="1.8-10"; sha256="1wb9rnj39lxa1mcrsgniyrysdzspgcspql3bfaiqsyyqybbp0z1b"; depends=[colorspace Hmisc MASS nnls polynom]; }; smacpod = derive2 { name="smacpod"; version="1.4.1"; sha256="17f28nax92nkfgs972gqcjnnz6sw4p8n36rrhx00dy19vr569kp5"; depends=[plotrix SpatialTools spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; }; @@ -6921,7 +7242,7 @@ in with self; { smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; smbinning = derive2 { name="smbinning"; version="0.2"; sha256="1zps1gdn5s7ynbkxmxp5s3xvzixdkcrfyvz5qrv77s4825lkj57x"; depends=[Formula gsubfn partykit sqldf]; }; smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; - smcfcs = derive2 { name="smcfcs"; version="1.1.1"; sha256="0jfcn7qv93hhazcmzqayq4nz64872lf463inrpsrhasvk00vy6vy"; depends=[MASS survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.2.1"; sha256="1v143di0y8c0dcsjham1dmsyh1k0583nhw4qzlignxpg8nf6n4xc"; depends=[MASS survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smdata = derive2 { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; @@ -6930,10 +7251,10 @@ in with self; { sme = derive2 { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; smerc = derive2 { name="smerc"; version="0.2.2"; sha256="0x1n1plnq63grs09cijhy265xqrfg9az1pp9n5dg5wqlj6gf9rzi"; depends=[fields igraph maps smacpod SpatialTools spdep]; }; smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; - smint = derive2 { name="smint"; version="0.4.0"; sha256="1qbmz67c9v45x9sqqd879gs1k0pq531bgfzg8cbll5nmc9nvig45"; depends=[lattice Matrix]; }; + smint = derive2 { name="smint"; version="0.4.2"; sha256="0sfk8r4jzvfs63z1vka280hdmhcbcrspr9zxwc5az9hkj65g1n0f"; depends=[lattice Matrix]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; }; - smoof = derive2 { name="smoof"; version="1.1"; sha256="0lb2n82xw1aqddlkm0qqk6lkqk84g642ip046i76nx26b887i678"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer Rcpp RcppArmadillo]; }; + smoof = derive2 { name="smoof"; version="1.3"; sha256="0b8hs12xvqkr5kkzlbc8rq4zmm6ndmzxhm07zzapsnqckp55g8v7"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D RColorBrewer Rcpp RcppArmadillo]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; @@ -6959,29 +7280,33 @@ in with self; { snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; snplist = derive2 { name="snplist"; version="0.15"; sha256="1xak7j6cbp8wapa99v38nzlhdc31ywfqjn4a7s9ibh2nb0plbjla"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; sns = derive2 { name="sns"; version="1.1.0"; sha256="1pppf1h39kv8jjngkcrq091ldzz3knjgcn81gfg7y54yndb2mapr"; depends=[coda mvtnorm numDeriv]; }; - soc_ca = derive2 { name="soc.ca"; version="0.7.2"; sha256="0vzdfh51kq0ry49bh2cv9sjbkv957inwwi9isf2mgd8mk8ks7z70"; depends=[ellipse ggplot2 gridExtra scales]; }; + soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; }; sodavis = derive2 { name="sodavis"; version="0.1"; sha256="1cci7aq2yqxb97ah5nycmhvg3d47fsicdgmgnw4yz88y61b3ndll"; depends=[MASS nnet]; }; sodium = derive2 { name="sodium"; version="0.2"; sha256="0y8piyjp09b2d9b3w7csikxrrf9aa8rdyi9awd73sxh9dj8l4452"; depends=[]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; softclassval = derive2 { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; }; soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; }; - soilDB = derive2 { name="soilDB"; version="1.6.6"; sha256="0hdj5cmfxnm3vdqxw8pqb9v35qrpbqyddpmma23jvc0zjd2g675a"; depends=[aqp Hmisc plyr reshape sp XML]; }; - soilphysics = derive2 { name="soilphysics"; version="2.4"; sha256="0mxh9jv7klk85zb30agg9c60d0y6v7rxapmvmmkc985ih94r5685"; depends=[MASS rpanel]; }; + soilDB = derive2 { name="soilDB"; version="1.7"; sha256="1wyawqwab4y3xg6bz7180xflxrwzr27bgsjnni7lpsjsa65mqid1"; depends=[aqp Hmisc plyr reshape sp XML]; }; + soilphysics = derive2 { name="soilphysics"; version="3.0"; sha256="1b6wzdb63qq0h1aaw08i2qg7410997i2cszr012g5f4dnmrwamln"; depends=[boot MASS rpanel tkrplot]; }; soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; soiltexture = derive2 { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; }; + solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; }; solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; }; solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; }; + solrium = derive2 { name="solrium"; version="0.3.0"; sha256="0y70qkj9wyrvfc8a9c1936ibbjcpic2wib2a2jc094cigf6wgz5r"; depends=[dplyr httr jsonlite plyr XML]; }; som = derive2 { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; + sommer = derive2 { name="sommer"; version="1.3"; sha256="06rzsq1f3s4kpsyx7dl1459r4b5h1nqp085f8z3m0arkn7qpv7jk"; depends=[MASS Matrix matrixcalc plotrix RColorBrewer]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; soobench = derive2 { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; }; + soql = derive2 { name="soql"; version="0.1"; sha256="0i6vawsdbnbxsxh5la1yr895a21sgp02fr1nvc7mawfv54and7x0"; depends=[]; }; sortinghat = derive2 { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; sos = derive2 { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; }; @@ -6989,7 +7314,8 @@ in with self; { sotkanet = derive2 { name="sotkanet"; version="0.9.21"; sha256="0x3dg38i2naf270qjc7dzmvf32ziihsa6m8yv1wh0l7sbk78h7cv"; depends=[RCurl rjson]; }; soundecology = derive2 { name="soundecology"; version="1.3.1"; sha256="07ncas8rn55pfqgj66qdwp28wh1v9yb8rkr36anc55a6svqx6g89"; depends=[ineq oce pracma seewave tuneR vegan]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; - sp = derive2 { name="sp"; version="1.2-1"; sha256="1d64lhyfwnj38sv61g4dlwkzgi75a8a15z8rn2p2qx28ymmzai1f"; depends=[lattice]; }; + sourcetools = derive2 { name="sourcetools"; version="0.1.2"; sha256="03jzag3xd68vp0d3mh5wc6ihx6710wrprf5952h1lannj6zj4cks"; depends=[]; }; + sp = derive2 { name="sp"; version="1.2-2"; sha256="0104xibkj78522rg0h2wkckfgzswxngqkpzi6vfpjm60c8n6m872"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; spBayes = derive2 { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[abind coda Formula magic]; }; spBayesSurv = derive2 { name="spBayesSurv"; version="1.0.3"; sha256="1vglfqqk4pg8kc6jnnw7br2lvwmz7szcpfqms95ij3bmawhazhrw"; depends=[coda Rcpp RcppArmadillo survival]; }; @@ -6999,14 +7325,14 @@ in with self; { spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="2.0-1"; sha256="15yrbxx44cqphhr71b5hiimwwjiwwpzny16xjb87nn2lc4mb53by"; depends=[coda sp]; }; spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; - spaMM = derive2 { name="spaMM"; version="1.6.2"; sha256="1ywga7qwxnhr0hbvd68xz0zpp0ikz9gk31np212w9s6xsvfr3k5q"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm nlme proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="1.7.2"; sha256="07rwsk1yviphiw7jipx045y6806vzadx9ddzrm6mhhx879dn1j2q"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm nlme proxy Rcpp RcppEigen]; }; spaa = derive2 { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; }; space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; }; spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; spacetime = derive2 { name="spacetime"; version="1.1-5"; sha256="0r6ycr0apm12dahw9x00jrxjdwp3888wnbdi02dr3s3imxlfxkrz"; depends=[intervals lattice sp xts zoo]; }; spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; - spacom = derive2 { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; + spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; spam = derive2 { name="spam"; version="1.3-0"; sha256="1zw3c26dj3pj61mnb2xdfzvvlsiandfqax1zacg0cc4pd1d1g342"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanr = derive2 { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; }; @@ -7014,18 +7340,18 @@ in with self; { sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; }; spark = derive2 { name="spark"; version="1.0.1"; sha256="03viih0r7bpv6zkm5ckk0c99lf2iv0fkgrzkbs1gg7ki9qyxji8c"; depends=[magrittr]; }; - sparkTable = derive2 { name="sparkTable"; version="1.1.0"; sha256="102dsl1jvr5d8bbqb5c9m3c3fn2h1yp3hb5nxp3whgc4gfq0xpmp"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; + sparkTable = derive2 { name="sparkTable"; version="1.2.0"; sha256="0hmdri8738gqn1dd9flqh1icd0r5mwnx4wnww0nwyr4anzxz2say"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; - sparr = derive2 { name="sparr"; version="0.3-7"; sha256="1q1lc4yhdvhvwh5v3cw90p47v5mw2r13brfz6paz9qg0bhd015lg"; depends=[MASS rgl spatstat]; }; + sparr = derive2 { name="sparr"; version="0.3-8"; sha256="1vsfk769f6227wrxfpq3qbs9h8farfnmgq94pl2ra4hgvpvygsmr"; depends=[MASS rgl spatstat]; }; sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; - sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.2.0"; sha256="1sj9d2d8bfjd00jr682gj21d4y0hjm91l3hj7356fpq461nb9pl8"; depends=[Matrix Rcpp RcppEigen]; }; sparseLDA = derive2 { name="sparseLDA"; version="0.1-7"; sha256="1rjjkvs9s25v85rdaxln8gnb88jhdj8s8lw8qxrjsgcgms7nvlqx"; depends=[elasticnet MASS mda]; }; sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; }; sparseMVN = derive2 { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; }; sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; + sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[bdsmatrix corpcor mvtnorm]; }; sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; - sparsereg = derive2 { name="sparsereg"; version="1.1"; sha256="17in6qcx4yh70vlidsqlxj4f9a3vffpzfpyr54m9j05g6v84ff76"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; + sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; spartan = derive2 { name="spartan"; version="2.3"; sha256="09j5f9f068m83279ncfxpyg8bnk25qjz20a9xlap8dpm50iidr24"; depends=[]; }; spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; spate = derive2 { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; }; @@ -7034,23 +7360,23 @@ in with self; { spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; }; spatial_tools = derive2 { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="0.1-3"; sha256="1nwp4rs8vwnh61cw2zkq5sbjz1figc1fx5g0id1w9j0iqnvvlviy"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp spatstat spdep yaImpute]; }; + spatialEco = derive2 { name="spatialEco"; version="0.1-4"; sha256="086qf081gkwm507qqqiklwbj2jk8kqgnijhd7wi8mdvz3ilam0j3"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp spatstat spdep yaImpute]; }; spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; spatialkernel = derive2 { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; }; - spatstat = derive2 { name="spatstat"; version="1.44-1"; sha256="0777lm76am8d6h17hkh6hh5rvmksxq7xafwxmp1qx6ywxgkf8f36"; depends=[abind deldir goftest Matrix mgcv nlme polyclip tensor]; }; + spatstat = derive2 { name="spatstat"; version="1.45-0"; sha256="0ilvj3kskrxy93wrl3a883r3x25mqzsy834hzqrq9cqmgnaryw1r"; depends=[abind deldir goftest Matrix mgcv nlme polyclip tensor]; }; spatsurv = derive2 { name="spatsurv"; version="0.9-11"; sha256="0wmjzccrx2k88i7kbxlxv8ig602b1k9pqb2hn3wxq1l4d8m4izw9"; depends=[fields geostatsp iterators Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; - spc = derive2 { name="spc"; version="0.5.2"; sha256="0z7s87riz1pcrg86dr43qw6s2i59vyy6fp9grl4aqxzdn1hrnsxl"; depends=[]; }; + spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; }; spcadjust = derive2 { name="spcadjust"; version="1.0"; sha256="1p011x3g1awb2sajg19fhkyrf5d8w4h9qwckxxl1i23jk3kpkyjh"; depends=[]; }; spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; }; spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; spdep = derive2 { name="spdep"; version="0.5-92"; sha256="1b5l6sfscnamfh957n3srgwc50f98az3071dcpqrhk4g4n2ws6yg"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; }; - spduration = derive2 { name="spduration"; version="0.14.0"; sha256="1vv8hr90kylyhy52q8bwdn6m5iil4fwhz7875q9yh73qwklqpnsq"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; + spduration = derive2 { name="spduration"; version="0.15.0"; sha256="1kziinnmn119s43brjpraw5vbsjv41gf031iaq9nhln1qbd2kv5j"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; }; spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; speaq = derive2 { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; }; @@ -7065,15 +7391,15 @@ in with self; { sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; sperrorest = derive2 { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; }; spfrontier = derive2 { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[ezsim maxLik moments mvtnorm spdep tmvtnorm]; }; - spgrass6 = derive2 { name="spgrass6"; version="0.8-8"; sha256="16zsd4y4y6ksa40pgj97vmy51894z5pdaldbmdfydrb8b7c6ypzp"; depends=[sp XML]; }; + spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; }; spgwr = derive2 { name="spgwr"; version="0.6-28"; sha256="1gwyfwsz9n7bz0n6sp6qd8qcl23r2i2kb38csxsh3pkrinnxy181"; depends=[sp]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; spider = derive2 { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; }; - spiders = derive2 { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; }; - spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-9"; sha256="04xlin61hfq9j9q4wvpkzmc189cpq4jp5cdn3kz64skzlsc5yj2z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; + spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; + spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; splancs = derive2 { name="splancs"; version="2.01-38"; sha256="12x68i5yjq9526rsf2awp97yg19izkhcc8iha0ys65bmhzjc5hwf"; depends=[sp]; }; @@ -7084,16 +7410,18 @@ in with self; { splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; }; splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; }; spm12r = derive2 { name="spm12r"; version="1.1.1"; sha256="1zvf05jfqnimxqj39cmg35hjhnqc5hvkirai11silyiy5aya8ka4"; depends=[fslr git2r matlabr oro_nifti R_utils stringr]; }; - spnet = derive2 { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[shape sp]; }; - spocc = derive2 { name="spocc"; version="0.4.0"; sha256="01g1c3r69vg0ja7slpv27abpawacna09hi4lna7h0kgbxpxf321n"; depends=[AntWeb ecoengine httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet V8 whisker]; }; + spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; + spocc = derive2 { name="spocc"; version="0.4.5"; sha256="1lzs3x3dvjava2bylc0q0isavkh2sk1a85nswmj8rapfa261fzza"; depends=[data_table httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet V8 whisker]; }; spoccutils = derive2 { name="spoccutils"; version="0.1.0"; sha256="1al7hydwwzqd8ky91ggklf7lk42g79cx24i47gapd84jnwmmkq56"; depends=[ggmap ggplot2 gistr httr leafletR RColorBrewer rworldmap sp spocc]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; + spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; }; sprex = derive2 { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; }; sprint = derive2 { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; }; sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; }; - sprm = derive2 { name="sprm"; version="1.2.1"; sha256="1b2x7c1a3f4gv67vnpsbfgzyfpj2g6fpvakp09apq4a399aig6nd"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; }; + sprintfr = derive2 { name="sprintfr"; version="0.1.0"; sha256="1jkrgvnybd2799alfrrd91bb7rdm8w0snx45brgrzlmwfvdrbfc7"; depends=[dplyr lazyeval magrittr stringi tidyr]; }; + sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; }; sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; - spsann = derive2 { name="spsann"; version="1.0-2"; sha256="1wqvr5rqnm4waik8hqf4q12ximp3yal40hb54gn4xxv7w3nyipig"; depends=[pedometrics Rcpp sp SpatialTools]; }; + spsann = derive2 { name="spsann"; version="2.0-0"; sha256="1if86d9qm9b2798284axlkp35zxgzmzvp2816i5fqxn50j8fcqy3"; depends=[pedometrics Rcpp sp SpatialTools]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; spsmooth = derive2 { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; }; spsurvey = derive2 { name="spsurvey"; version="3.1"; sha256="1dgrrar6k87xgcxhj3xi0zap5shr26d4hv6k3pfjihbwvygf82z8"; depends=[deldir foreign MASS rgeos sp]; }; @@ -7106,22 +7434,23 @@ in with self; { squash = derive2 { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; }; sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; }; srd = derive2 { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; }; + srvyr = derive2 { name="srvyr"; version="0.1.0"; sha256="0ppa8h4k49gmn0gmlmh7zn1lqpirh9p4zrj19vhw9x3fgca1klsc"; depends=[dplyr lazyeval magrittr survey]; }; ss3sim = derive2 { name="ss3sim"; version="0.9.0"; sha256="1fnjrxjcb76g9xwa05lwhwkwxaxp03zfgzq9dy7jbibcclblh7a1"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; }; - ssa = derive2 { name="ssa"; version="1.0.0"; sha256="01lbkphl3bd8a7wkb5yrhls3r1cynlx9xvfkcmny061xa1bvbq36"; depends=[]; }; + ssa = derive2 { name="ssa"; version="1.1.0"; sha256="0jmnm7vhdz0v2shhcibfajpdzh23jpq4snjkdz7kgfh8g4yr0r2f"; depends=[]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; - sscor = derive2 { name="sscor"; version="0.1"; sha256="0bvj6kzkjgdjwia907if8jlicygkh5gnk3s159gv9wvc50rjjab3"; depends=[mvtnorm pcaPP robustbase]; }; + sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; - ssizeRNA = derive2 { name="ssizeRNA"; version="1.1.2"; sha256="11dnc3wqj0i5blzc9ndpgl48xm5fibjgx9sxrzdcza0gbj8qpadm"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; + ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.4"; sha256="0v7ca1xsnpx7zbgwx8196y13wdnlbxdrc4nv2r7m797anj9sjj6a"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; ssmrob = derive2 { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive2 { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; }; sss = derive2 { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; }; ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; - ssym = derive2 { name="ssym"; version="1.5.4"; sha256="1g9w18f1z5lydg38bn0m965a2irj9sp00lb7y5mf4pwsw9qdw925"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; + ssym = derive2 { name="ssym"; version="1.5.5"; sha256="1j2dm2q3bcg8r9nxhmdrsi3azwhyv3q8nsj1bvz8507hzg3qvnxf"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stabledist = derive2 { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; }; @@ -7131,19 +7460,19 @@ in with self; { stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stargazer = derive2 { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; depends=[]; }; - starma = derive2 { name="starma"; version="1.2"; sha256="1jpvwdv8ms69y9qc4lsh4llnv2iw95g11mrfi8ny1wirq069f73w"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; + starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; startupmsg = derive2 { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; }; stashR = derive2 { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; }; - statar = derive2 { name="statar"; version="0.5.0"; sha256="05n7z2b7yvr58iq5p5i51z4vrab6d7978lpl302g2x4gi6s90v8f"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stargazer stringr tidyr]; }; + statar = derive2 { name="statar"; version="0.6.0"; sha256="08pkjhn8g6f6jjx8gilmb9k2jdrkd8n17dgk2q7x5yjiviib1h00"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stargazer stringr tidyr]; }; statcheck = derive2 { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; statfi = derive2 { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; }; stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; }; - statmod = derive2 { name="statmod"; version="1.4.22"; sha256="1gmq3sicxl1vkznahcnvbas4lhx3a8f1znylmbhn870p8clch0if"; depends=[]; }; + statmod = derive2 { name="statmod"; version="1.4.24"; sha256="0vvjj5qgykk8abkj25g92kvm9sx5s10ysm5dh4ywlmz2lzfi3ilf"; depends=[]; }; statnet = derive2 { name="statnet"; version="2015.11.0"; sha256="0blrf7ag309d5h00w0zvcwbzif6s3nz5flazqrgkkykscn99kjxl"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; }; statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; - stcm = derive2 { name="stcm"; version="0.1.1"; sha256="05p0lp0p1mgcsf3mi3qgx42pgpv04m5wfmqa14gp63ialkl9pgx5"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; }; + stdReg = derive2 { name="stdReg"; version="1.0"; sha256="1rixqpbbqcqfjm8nn3plypzhz38fcw9ryyvr0aq10vbymbxjx0jv"; depends=[data_table survival]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; @@ -7155,21 +7484,24 @@ in with self; { stilt = derive2 { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; }; stima = derive2 { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; }; stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; }; - stm = derive2 { name="stm"; version="1.1.0"; sha256="0j1mgi584b28g3c0ai56fr1gks1kbd0s18xl7jbxndfiprk8q8f4"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; }; + stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; + stm = derive2 { name="stm"; version="1.1.3"; sha256="09r95d6xw2b4q063x1j2a6wc9kyzphqc2dhfmlc9crir8fah9ayr"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; }; stmBrowser = derive2 { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.2"; sha256="0mhwl64hv4hjq72mqnvc5ii94aibmc0fw5rmdrvsad4bj6gg67p3"; depends=[jsonlite stm]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; - stochvol = derive2 { name="stochvol"; version="1.2.2"; sha256="0dpi2a3c7m12znci7xa3814jaf5lm1iyi0mf4bnzrqskcxb7p76c"; depends=[coda Rcpp RcppArmadillo]; }; + stochvol = derive2 { name="stochvol"; version="1.2.3"; sha256="122jw21qx44rpmrr5dbi4f98951b25ifj6277pfr4s4l4rsdkypz"; depends=[coda Rcpp RcppArmadillo]; }; stockPortfolio = derive2 { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; + storr = derive2 { name="storr"; version="1.0.0"; sha256="0q10g2x0g3jrvdv49bbjw5qaf9gmsrl5x7fws2liflqf3k2f5kfj"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; }; - stplanr = derive2 { name="stplanr"; version="0.0.2"; sha256="1h8fn14w8grhji854nk4b1g1vd212qx0dslm1hwjpmwdwldn6rcf"; depends=[dplyr httr jsonlite leaflet maptools openxlsx raster rgdal rgeos RgoogleMaps sp]; }; + stplanr = derive2 { name="stplanr"; version="0.1.1"; sha256="0fcyirhx4lxlwizrl9spblnqp8nv11xzjk90kbq3k0i7gpvrrbh8"; depends=[dplyr geosphere httr igraph jsonlite leaflet lubridate magrittr maptools openxlsx R_utils raster Rcpp RcppArmadillo RCurl readr rgdal rgeos RgoogleMaps sp stringi stringr]; }; + stpm = derive2 { name="stpm"; version="1.1.2"; sha256="0n875h6x31wcslqnqwwwl4gf18v4wgm18alw7fsdgwjjz5wdj3yx"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[KernSmooth spatstat splancs]; }; stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; - strataG = derive2 { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[ape MASS pegas Rcpp reshape2 swfscMisc]; }; + strataG = derive2 { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[ape MASS pegas Rcpp reshape2]; }; stratification = derive2 { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; }; stratigraph = derive2 { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; }; straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; @@ -7179,14 +7511,15 @@ in with self; { stremo = derive2 { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; stringdist = derive2 { name="stringdist"; version="0.9.4.1"; sha256="0a2j1h5kf0p14d117rq8fv6qbk8nwsianmkb73d0f6cb1ikadnmg"; depends=[]; }; - stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; }; + stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt GO_db httr igraph limma org_Hs_eg_db pspearman RCurl RJSONIO simone VennDiagram]; }; stringi = derive2 { name="stringi"; version="1.0-1"; sha256="1ld38536sswyywp6pyys3v8vkngbk5cksrhdxp8jyr6bz7qf8j77"; depends=[]; }; stringr = derive2 { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; }; + stripless = derive2 { name="stripless"; version="1.0-1"; sha256="0r5vi6hybw3z7lrsmnjnrjl1gj9b7zf2iqfk2nqwxw4cky17i4cd"; depends=[lattice]; }; strptimer = derive2 { name="strptimer"; version="0.1.0"; sha256="0fyrapai58rarf6xy9vlg3lmkzgdcpfchrkdlqj69jkiz7ngh4qv"; depends=[dplyr lazyeval magrittr stringi tidyr]; }; strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; }; structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; }; strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; }; - strvalidator = derive2 { name="strvalidator"; version="1.5.2"; sha256="1xqgs50vppg8277s446m71wpdqs32v8i1ymzj130xfx9q832gnxk"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 plyr RGtk2 scales]; }; + strvalidator = derive2 { name="strvalidator"; version="1.6.0"; sha256="0hy673c1dgxvkplph9g4iihn78diw98lchfhp5inzr2a8w5syyq3"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 plyr RGtk2 scales]; }; stsm = derive2 { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; stubthat = derive2 { name="stubthat"; version="0.1.0"; sha256="1k6s3sn3swm6pxbv81kw8p2m60q9m1nw64jgimf08qwsrsbfx11h"; depends=[]; }; @@ -7194,7 +7527,7 @@ in with self; { suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; subplex = derive2 { name="subplex"; version="1.1-6"; sha256="0camqd0n468h93jxvvcnclki66glr39rb87nvrkrbiklbqd0s1fp"; depends=[]; }; - subrank = derive2 { name="subrank"; version="0.9.4"; sha256="1fzcs8lhc3hhvrk1dlqvhqr2g19ylcxzz4d4ydd0zv37h27f1crr"; depends=[]; }; + subrank = derive2 { name="subrank"; version="0.9.6"; sha256="0a467lihs9njf7sx032cip1r1g7x2rlwk7220c499kl0h3zg9p0j"; depends=[]; }; subscore = derive2 { name="subscore"; version="1.2"; sha256="0q96n7bplzb8hhaq48bnkq7wvgryf815qc5iql5780jsixwhgn04"; depends=[CTT]; }; subselect = derive2 { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057zwwk1xdvji25yakgagf98ggixmvfrk1m1saa4"; depends=[]; }; subsemble = derive2 { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; }; @@ -7219,20 +7552,21 @@ in with self; { survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; }; survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; }; survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; - survMisc = derive2 { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[combinat data_table gam ggplot2 gridExtra Hmisc km_ci KMsurv rpart survival zoo]; }; - survPresmooth = derive2 { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; + survMisc = derive2 { name="survMisc"; version="0.5.0"; sha256="1dkjbxlnad77awb0cj2qkw7n6i55rfc56v5aa3yb3fmixk6qw73v"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival zoo]; }; + survPresmooth = derive2 { name="survPresmooth"; version="1.1-9"; sha256="146ni0xnqd4kfxfxm8nkrgk6v4nrf2hpbb957zh10kmvaa5f9mij"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; }; survSNP = derive2 { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[foreach lattice Rcpp survival xtable]; }; - surveillance = derive2 { name="surveillance"; version="1.10-0"; sha256="19bciw826pc2fhhrp0rc4xfr80mbm83vxpydrfpa4yvw98s3i1ix"; depends=[MASS Matrix polyCub Rcpp sp spatstat xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.11.0"; sha256="0mnnr3cq4ksa9jrqmky96byxag8vv0ak95x2sfm7ppfcymcpb2ya"; depends=[MASS Matrix polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive2 { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; }; surveydata = derive2 { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; - surveyoutliers = derive2 { name="surveyoutliers"; version="0.0"; sha256="09xnl1pas8w232daml68jrn2nj7cgmhv0sbclbwg7q8c0wlzxan8"; depends=[]; }; - surveyplanning = derive2 { name="surveyplanning"; version="1.0"; sha256="183f6l4myadjsnip9b8yy3s3sw55qn466vpb3xw78mfyw671vkvy"; depends=[data_table]; }; + surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; + surveyplanning = derive2 { name="surveyplanning"; version="1.2"; sha256="0ha0q1d47iwdfxlgjs13ahhghwsmq4xqiiqk8ynkgdq7bfp88a7z"; depends=[data_table]; }; survival = derive2 { name="survival"; version="2.38-3"; sha256="1hkji557sz4q86pp7xj3h4cdwsnfl1mlj4c6c917mnbijj3bm215"; depends=[]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; + survminer = derive2 { name="survminer"; version="0.2.0"; sha256="1id65p2q963an9lfp6pb9bm6h213hpa40pmar4h6x982a3dbjfzl"; depends=[ggplot2 gridExtra scales survival]; }; survrec = derive2 { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; }; survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; }; svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; }; @@ -7249,18 +7583,18 @@ in with self; { svWidgets = derive2 { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; - svd = derive2 { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; }; + svd = derive2 { name="svd"; version="0.4"; sha256="06bw4nypj9p57py2vw26yhzn3gw7clvby1mxbg2s2wj3jyay47p5"; depends=[]; }; svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; - svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.0"; sha256="0vl8sg8dwa9hyvkd5l3nnl79mhn22wj3kkvjm4n2azrjd8xihf2b"; depends=[htmlwidgets]; }; + svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.2"; sha256="0hj4z6znp02p7gwadrqh9sagn8ydcwl52cckhinlycawjinzqcgs"; depends=[htmlwidgets]; }; svgViewR = derive2 { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; }; - svglite = derive2 { name="svglite"; version="1.0.0"; sha256="0sfljl4y4ws4p4rghpx0ls25divlvm6gpmnjnn2r3m3df6q43qii"; depends=[gdtools Rcpp]; }; + svglite = derive2 { name="svglite"; version="1.1.0"; sha256="11ryicjglfi6jvkk4jgg5kra42qbs5z2zid7jjhlslpjcljfwc70"; depends=[BH gdtools Rcpp]; }; + svmadmm = derive2 { name="svmadmm"; version="0.2"; sha256="0g4q96gzd4h6ykc6ny1v06zabyyw6vm2slsfbsnnkxk4gah46zyj"; depends=[kernlab]; }; svmpath = derive2 { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; }; - svs = derive2 { name="svs"; version="1.0.3"; sha256="1mcx9985wn898q7vlj3daxclmdbzz67r6d825451jzvjliy7w91i"; depends=[gtools]; }; + svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; }; - sweidnumbr = derive2 { name="sweidnumbr"; version="1.0.0"; sha256="0m9iqscgr517y8vv5z1jbzfql27l0iq93046sxkai5njq9kpbhq1"; depends=[lubridate stringr]; }; - swfscMisc = derive2 { name="swfscMisc"; version="1.0.6"; sha256="14bbcn8xkc32nagi92sahdvfbgfd4v7pari1c004dz0qgxxcnz1h"; depends=[mapdata maps spatstat]; }; + sweidnumbr = derive2 { name="sweidnumbr"; version="1.1.0"; sha256="0ym7rnfd8wcab1vwpm64yh6day3ypzrlpvdrw5agc1nckhl9xp1p"; depends=[lubridate stringr]; }; swirl = derive2 { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.4.1"; sha256="15xd18jgrqsq9w0qa64qxfcinrsy87mjbwc0s22x06yzhpcvcmdk"; depends=[rmarkdown stringr swirl whisker yaml]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; @@ -7276,12 +7610,12 @@ in with self; { symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; - synbreed = derive2 { name="synbreed"; version="0.11-22"; sha256="0l95hjvf8sd6lfbxiyy0s6b22bj80kq6j8jzy38yb54asmj3gp49"; depends=[abind BGLR doBy igraph lattice LDheatmap MASS regress]; }; + synbreed = derive2 { name="synbreed"; version="0.11-29"; sha256="05f690d3gyr6zmp3s8ld5vy4a0ng8ikxpr28xi9l7m62j9c4pcic"; depends=[abind BGLR doBy igraph lattice LDheatmap MASS regress]; }; synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; - synchronicity = derive2 { name="synchronicity"; version="1.1.9"; sha256="0vjwcdr8k9i6lbwfs239l9q3chrwwaspsrbi6js8jw2ayvz3zipk"; depends=[BH bigmemory_sri Rcpp]; }; + synchronicity = derive2 { name="synchronicity"; version="1.1.9.1"; sha256="0d9skpwmsnkn4xb3f2kgyyv8bhdi0r9p1kj3cvi0s92fjjnpi00c"; depends=[BH bigmemory_sri Rcpp]; }; synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; }; - synthpop = derive2 { name="synthpop"; version="1.1-1"; sha256="0l65pbjcc163dqalkz1dil5bpfb9f3p4wx6hpr7z4g0ir58anbip"; depends=[coefplot foreign ggplot2 lattice MASS nnet party plyr proto rpart]; }; + synthpop = derive2 { name="synthpop"; version="1.2-1"; sha256="0siwgg16zky0dlw0wvl3n20y4pr94q3was8gw4llrla7jkh0g4pj"; depends=[foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; sysfonts = derive2 { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-18"; sha256="0sy0v0iz4qzrmazp5j63d62xvlyi9mw5ryd4msd1xmppdl7r453p"; depends=[car lmtest MASS Matrix sandwich]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.3"; sha256="07i3pjghx2v8brx0k6xy5bk1d263wwyh5mbg7bzs4vwn4dh5k08f"; depends=[lpSolve Rcpp]; }; @@ -7290,7 +7624,7 @@ in with self; { taRifx_geo = derive2 { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; }; tab = derive2 { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; - tablaxlsx = derive2 { name="tablaxlsx"; version="1.0.3"; sha256="04f9n3pq17h4zin9dsipizfkqjrnj7s9klsanq1z1l93i38mkalk"; depends=[openxlsx]; }; + tablaxlsx = derive2 { name="tablaxlsx"; version="1.0.8"; sha256="06l4rw6snhpkx6i74hh7i34mp9p1y7dwkpsmkq4083cm94hz308d"; depends=[openxlsx]; }; table1xls = derive2 { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; }; tableone = derive2 { name="tableone"; version="0.7.3"; sha256="0ffir00gzrx4fxci018vra7m8hfiqmvlib52wlxikksna2ha51qv"; depends=[e1071 gmodels MASS survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; @@ -7298,12 +7632,13 @@ in with self; { tabplot = derive2 { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; }; tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; + tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.9.0"; sha256="0p0bnmycqkbg2zq0hlanap09pn7jl90l4pmmkfs2i7l58pql3cr9"; depends=[broom car dplyr ggplot2 haven lazyeval pixiedust pwr ryouready sjmisc vcd]; }; tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; }; tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; }; tau = derive2 { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; }; tawny = derive2 { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; - taxize = derive2 { name="taxize"; version="0.7.0"; sha256="0ns2x241ha9cw9v38kqa0sflz1jlrl6pg8fj6njzw20ajhivv3b3"; depends=[ape bold data_table foreach httr jsonlite plyr reshape2 stringr XML]; }; + taxize = derive2 { name="taxize"; version="0.7.4"; sha256="17gpd471awjr798q4973kj4xgrdqlgjdxp7fzpr9sf969vaz1jq8"; depends=[ape bold data_table foreach httr jsonlite plyr reshape2 rredlist stringr xml2]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; tcR = derive2 { name="tcR"; version="2.2.1.7"; sha256="1m37ndk73y267q6byzpf8kfx8vsd5j2xdspcgkz6743fkaj1myam"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; @@ -7312,24 +7647,25 @@ in with self; { tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; }; tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; teigen = derive2 { name="teigen"; version="2.1.0"; sha256="1b9vkz812jsvzxs4751q8zmkvbc1bh4zbi4pd0550b181vxnn8wa"; depends=[]; }; - telegram = derive2 { name="telegram"; version="0.3.0"; sha256="1pl95i4z3751li1vqmrf9w3x46a37gxq37gj8cibk0axgwsmk63v"; depends=[httr R6]; }; tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; }; tempdisagg = derive2 { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; }; tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; + tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; }; tergm = derive2 { name="tergm"; version="3.3.1"; sha256="1k10pmm3b62naw4mcy7318yzjq1j1s5qqjsmz90vnh0dajfhvhbw"; depends=[coda ergm network networkDynamic nlme robustbase statnet_common]; }; termstrc = derive2 { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; }; ternvis = derive2 { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; - testit = derive2 { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfhwqjjdigdm1rqf88sp7435wksyv8i"; depends=[]; }; + testit = derive2 { name="testit"; version="0.5"; sha256="1v39mz4qrcml90p5d1z9x0cs2llj2pgfpymdwndh9r94ndlzs5hl"; depends=[]; }; testthat = derive2 { name="testthat"; version="0.11.0"; sha256="1fks5d4sbh4ya1va1p2815kwrklflm8ifplp6kjx1d1y09hrx9i4"; depends=[crayon digest praise]; }; testthatsomemore = derive2 { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; texmex = derive2 { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; texmexseq = derive2 { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; }; - texreg = derive2 { name="texreg"; version="1.36"; sha256="1fk4pm7w1pghx40qvpiqvij2r8zy13lxcyn1bpml466g1359ra5m"; depends=[]; }; - textcat = derive2 { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[slam tau]; }; + texreg = derive2 { name="texreg"; version="1.36.4"; sha256="11iivv5pslwqd0nbi533jyigwd16yx2mx1gl22ip8ghqvllfzxmk"; depends=[]; }; + text2vec = derive2 { name="text2vec"; version="0.2.0"; sha256="0s73phk4dzm1f9wcj5b1iha1g6rv3hvd6iwy97kgwxqd308cas48"; depends=[digest iterators magrittr Matrix Rcpp RcppParallel readr stringr]; }; + textcat = derive2 { name="textcat"; version="1.0-4"; sha256="0mxxs2zq6zijh954r7zxvh2l416k49jghzbdzwcm55mf133lb07z"; depends=[slam tau]; }; textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; }; - textmineR = derive2 { name="textmineR"; version="1.5.1"; sha256="193s34g8wrj6hh63a1i6vvqby3fkwvlr02bap2n9vxlf37sbglqs"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RWeka tm]; }; + textmineR = derive2 { name="textmineR"; version="1.6.0"; sha256="1cgpy0hk73jigag4x48ygkvks8k2x3m1amf34li2ffbx2g6066jb"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RWeka tm]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.2"; sha256="174gh9f4bfgpf8vnwcciq2y70rnzwln5yygzif28x5h960yckv5x"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; @@ -7337,10 +7673,10 @@ in with self; { tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; }; tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; }; - tgcd = derive2 { name="tgcd"; version="1.7"; sha256="1745rrlldzimswv1vnwhcmsv3sxwf3ahnygyhqpk9c8lalnark2i"; depends=[]; }; + tgcd = derive2 { name="tgcd"; version="1.8"; sha256="0bq2swfz29dl1d745pprx9c3b8nplpb7d64v24nzxrj7yvjfwj90"; depends=[]; }; tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; }; tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; }; - tgp = derive2 { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; }; + tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; thgenetics = derive2 { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; }; @@ -7348,23 +7684,25 @@ in with self; { threejs = derive2 { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[base64enc htmlwidgets]; }; threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; }; threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; }; + thregI = derive2 { name="thregI"; version="1.0.1"; sha256="1ng13f08zj0sglh99ixr0afzwj1fag8b88046bzdzq4vf3vq5v36"; depends=[Formula survival]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; + tibble = derive2 { name="tibble"; version="1.0"; sha256="105iammxmhm2mlv3fq0gvrglz6gqyvm4iiiilsvq54fw0z68a4n6"; depends=[assertthat lazyeval Rcpp]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; tidyjson = derive2 { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; }; - tidyr = derive2 { name="tidyr"; version="0.3.1"; sha256="1xvc3iv1bapp7jjrr6y66ip6h4rcz6qbdidxb8mshxjvhkm6dbxb"; depends=[dplyr lazyeval magrittr Rcpp stringi]; }; + tidyr = derive2 { name="tidyr"; version="0.4.1"; sha256="0xp6lyr2l4ix2mrilx4qmca7wm5qmbhvi24m4nf7qsgwp54gnv2h"; depends=[dplyr lazyeval magrittr Rcpp stringi]; }; tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerstats = derive2 { name="tigerstats"; version="0.2.7"; sha256="1jgglgdv1xjyyc376ggydvna26lb4f7l7lv82xn56fa8asdssd91"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; }; tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; - tigris = derive2 { name="tigris"; version="0.1"; sha256="06zb4bd9c1dpxn0wdxvdb70q01zj9vxrvi4laaapk8l9q2aim6z9"; depends=[httr magrittr maptools rappdirs rgdal rgeos sp stringr uuid]; }; - tikzDevice = derive2 { name="tikzDevice"; version="0.9"; sha256="0jxjaiga4wri5rdwiimqhr4q5lmawm28a62lbfzwrf9hhbl808s5"; depends=[filehash]; }; + tigris = derive2 { name="tigris"; version="0.2.2"; sha256="0pc9fg6p7qsdmq1pjp0mqaxmdqxcskp3hcn6sgabpa40q37gb77z"; depends=[httr magrittr maptools rappdirs rgdal rgeos sp stringr uuid]; }; + tikzDevice = derive2 { name="tikzDevice"; version="0.10-1"; sha256="1fjxzmp9wrf9bigzb4hkp2cb64sd6x4yhrjd6gryw17cqrblhicg"; depends=[filehash png]; }; tileHMM = derive2 { name="tileHMM"; version="1.0-7"; sha256="1ks4b6h15982jh3ls9fz8hq9ac1wf5hfjsvdqcmnba8n3m5zm651"; depends=[corpcor st]; }; timeDate = derive2 { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; }; timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.1"; sha256="054r5lnvl3wj92sx78qwh0mgrcncwqn94ph941knjwnbds4g2arj"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; }; timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; }; - timedelay = derive2 { name="timedelay"; version="1.0.0"; sha256="0wqcc8kzgvn6bn7kclb3wnaibycg5hpcji9g1a66pj14fwdabny3"; depends=[]; }; + timedelay = derive2 { name="timedelay"; version="1.0.2"; sha256="15hmby937zf7gs8lhbaxkpdjbg6vrfz7jg41p25mik1d5q8qf2v0"; depends=[mnormt]; }; timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; timeordered = derive2 { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; @@ -7379,6 +7717,7 @@ in with self; { tis = derive2 { name="tis"; version="1.30"; sha256="0bqvnaxqqq4962wfw4s9rf0qil613mplqcjwjlq1s9yfxl78gzzw"; depends=[]; }; titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; + titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; tkrgl = derive2 { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; @@ -7393,21 +7732,22 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tmap = derive2 { name="tmap"; version="1.2"; sha256="1qcm1lsyf63q1qdwxc9ki6wp509b4vqks3f8y6k4i5f8a2lzqs8f"; depends=[classInt gridBase gridSVG htmlwidgets KernSmooth osmar raster RColorBrewer rgdal rgeos sp spdep svgPanZoom XML]; }; + tmap = derive2 { name="tmap"; version="1.4"; sha256="1krdp213j26xr6a5pdb6a5d2pgx521a718kp2rcrrbw9ifgh4j1q"; depends=[classInt geosphere htmltools htmlwidgets KernSmooth leaflet osmar raster RColorBrewer rgdal rgeos sp spdep XML]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; tmle = derive2 { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; }; - tmod = derive2 { name="tmod"; version="0.19"; sha256="0wnj2dfp3jjvr8xl43kw86b3xgqd1662zjagzb9ayznx5vi2k5zb"; depends=[beeswarm pca3d tagcloud XML]; }; + tmod = derive2 { name="tmod"; version="0.24"; sha256="1v3yc2x9kchj8mg3h9111g55j2vzz484qx2k3kydsa1a77lv0rdf"; depends=[beeswarm pca3d tagcloud XML]; }; + tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-1"; sha256="1zl1adx5klhg33j87kx8hqvn7mdyfqi12xxljf29abdqmr4pkp95"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; tnam = derive2 { name="tnam"; version="1.6"; sha256="138jn4qdhk1c0mk43b8n5rr2zb20svli82kj1vkl75gxri0d5i26"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; }; tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; }; - toOrdinal = derive2 { name="toOrdinal"; version="0.0-4"; sha256="0vvdz9l4sl7nlq6y93c65gbwssisrp3a9sp021g2l0rli00zq9q1"; depends=[]; }; - toaster = derive2 { name="toaster"; version="0.4.1"; sha256="0xldmkb780fwmq9si98ppcalygj1nrvfhvbrlb3fmnr0wgf5flsr"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; }; + toOrdinal = derive2 { name="toOrdinal"; version="0.0-6"; sha256="13mp6sxjbn1piw2q018nb4hznzsa2c7pkvmlv74f8qsjrvvw1h4x"; depends=[]; }; + toaster = derive2 { name="toaster"; version="0.4.2"; sha256="0jz3gi8cblwqgl6kq6glhf2cb6r16davm850gz9s2i5synk4p2v7"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; }; tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; - tolerance = derive2 { name="tolerance"; version="1.1.1"; sha256="1amy2lfgwqnjnm7swarbb33wnn239j2p8zqlgairf54ps68z0f64"; depends=[rgl]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-2"; sha256="1nk3jgibs881isaadawyc377f4491af97jaqywc0z905wkzi008r"; depends=[modeltools slam tm]; }; + tolerance = derive2 { name="tolerance"; version="1.2.0"; sha256="0qvbmv4pq4mczr0ikhha52l0wc6rsb4h9mggsv8dg7g6snrrjb0h"; depends=[rgl]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-3"; sha256="1jhz4455p1bnw8cm11xnj5w3v1v9dgmzq9zmxl6a4l6x4v12di88"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.5"; sha256="1v6plj7v0i5fr6khl0ls34xc0hfd61cpabqpw5s1z3mqmqnma56a"; depends=[fields graph gRbase qpgraph]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; @@ -7419,9 +7759,10 @@ in with self; { tpr = derive2 { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbzblxnd9f7lp2w24hyp0zbbf1nxs68"; depends=[]; }; + trackeR = derive2 { name="trackeR"; version="0.0.1"; sha256="06c5k7c12nnhy00xly4j0f2hn4wl8i9gm1fiy3q9j6g7hyyrgvx5"; depends=[ggplot2 zoo]; }; tractor_base = derive2 { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; - traits = derive2 { name="traits"; version="0.1.2"; sha256="1amxn8w0jxd4zd52n00wrz6krlrg7hc66dj4j8lq96fyys8jjvpc"; depends=[data_table dplyr httr jsonlite taxize XML]; }; + traits = derive2 { name="traits"; version="0.2.0"; sha256="0qsnlp96ilwmaimph0bvkjw4kaqd3wpfy6knd7k5s321b68hqaam"; depends=[data_table dplyr httr jsonlite readr rvest taxize xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; @@ -7429,21 +7770,22 @@ in with self; { translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translateSPSS2R = derive2 { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; - transport = derive2 { name="transport"; version="0.7-0"; sha256="14kzn809j9qdr3qizcc5ya9pjwgsm5b6kbadwfqcnl3vghwvzvpg"; depends=[]; }; + transport = derive2 { name="transport"; version="0.7-3"; sha256="1rgbpj8n88fqw2ivdjhfl9jggazhh7hpalnpfv1rmf96khm76cc0"; depends=[]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; - treatSens = derive2 { name="treatSens"; version="2.0"; sha256="0maf9r35yixar1gb56z5h4v7al7qbh3a043ygx1y685smpwbj4vq"; depends=[dbarts]; }; - tree = derive2 { name="tree"; version="1.0-36"; sha256="0kqsmjw77p7n2awnlbnwny65rmmwb6z37x9rv1k4iqvvf8xbphg1"; depends=[]; }; + treatSens = derive2 { name="treatSens"; version="2.0.1"; sha256="0gb14f9dfa9slppl2a2bchkli51rprw6wzyzrkxlfqlski0piymf"; depends=[dbarts]; }; + tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; }; treeClust = derive2 { name="treeClust"; version="1.1-1"; sha256="06293w4r1h845jqzdqfnh7w5nsvyz4d0h6nn0w2aj4addj3sbp9y"; depends=[cluster rpart]; }; treebase = derive2 { name="treebase"; version="0.1.2"; sha256="0rn47gd1kggwwgzxqkjq364l1dcnw8ilqzmnr2cnkyzlx1afk5f3"; depends=[ape RCurl XML]; }; - treeclim = derive2 { name="treeclim"; version="1.0.13"; sha256="074mx9jf5zm62l9n5ibrh644p7vh8qhz25sg78dbk89m2nkdk85d"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; + treeclim = derive2 { name="treeclim"; version="1.0.16"; sha256="0fn79hmn266473ygi0pdkqgcycs7wy2fmvh974xl8bv1rh42sml0"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treemap = derive2 { name="treemap"; version="2.4"; sha256="097w7zn1dkv0whs2hsysvk7c05aj1a862sxnpk8ackdi2rmdj4xa"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; + treeplyr = derive2 { name="treeplyr"; version="0.1"; sha256="0y13m5ky3wyxf2d8np1xrd2ffrh814apyqkhd637mqwj58nnwbgy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; treescape = derive2 { name="treescape"; version="1.8.15"; sha256="12lhv1qlpj5c8k76zh7mvz3h6xqjp6ri7rfsawz4wzmhzfmagllz"; depends=[ade4 adegenet adegraphics adephylo ape combinat phangorn Rcpp RLumShiny shiny shinyBS shinyRGL]; }; treethresh = derive2 { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; }; - trend = derive2 { name="trend"; version="0.0.2"; sha256="0wbwhnhbi5gw182wa95ldiwj56zj4mv76pc55hd058z4spn8mhwd"; depends=[]; }; - triangle = derive2 { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; }; + trend = derive2 { name="trend"; version="0.1.0"; sha256="0nxayjs542lszl2vj1xi54fbl8h72rm0k7d92l7w7h7ldvqksiiz"; depends=[]; }; + triangle = derive2 { name="triangle"; version="0.10"; sha256="02s7iblk3fdrjhz0sns76bqrfwi0y0l6vbjfsb5mzq6pn45n0nkv"; depends=[]; }; trib = derive2 { name="trib"; version="1.2.0"; sha256="0bvz1cvi2fx40b5rdv4gfama11dn20rz4506k4fjsny32yswpqyw"; depends=[zoo]; }; trifield = derive2 { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; @@ -7451,7 +7793,7 @@ in with self; { trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; }; trip = derive2 { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[maptools MASS raster sp spatstat]; }; - tripEstimation = derive2 { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; }; + tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive2 { name="tripack"; version="1.3-7"; sha256="1kp3zxs1b6mjbrk0bbsz3jjvkxwm97jb0vvr66dpm57abyl1snly"; depends=[]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; @@ -7465,7 +7807,7 @@ in with self; { tsBSS = derive2 { name="tsBSS"; version="0.1"; sha256="1r2hcfki53kvngm1vp209z1aqp082a98jr42bzvxgix62wmh2cfj"; depends=[JADE Rcpp RcppArmadillo]; }; tsDyn = derive2 { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; - tsPI = derive2 { name="tsPI"; version="1.0.0"; sha256="0q6ym2glr7n7kf6ghgs41g9gg5mlsfd9cf8dca4bhmw20bbdsc0z"; depends=[KFAS]; }; + tsPI = derive2 { name="tsPI"; version="1.0.1"; sha256="0sdlcymhljw0di7mi5n4jmgqhfgvqix0jpp07f6wgjbqxkas4wr5"; depends=[KFAS]; }; tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; }; tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; @@ -7475,29 +7817,33 @@ in with self; { tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.5-12"; sha256="0z9354mlj0nh829ccwwhs53q5myfp31x9n6kv1k8gmvz5xma40kh"; depends=[cubature]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; - tsintermittent = derive2 { name="tsintermittent"; version="1.8"; sha256="0hzr0vkpc0v56932ffd1zlshlfzp6k3ngpa3l85cb10x9yvm0w5r"; depends=[MAPA]; }; + tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsna = derive2 { name="tsna"; version="0.1.3"; sha256="10iflkmc1ym01pvj42gxqsdj3ph44jnqc0j4c42c6xl3365xgdfy"; depends=[ergm network networkDynamic statnet_common]; }; tsne = derive2 { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; }; tsoutliers = derive2 { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast KFKSDS polynom stsm]; }; tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; }; tth = derive2 { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; }; + tttplot = derive2 { name="tttplot"; version="1.0"; sha256="0kiahy9f4d6cwzj2k3agrgn12z1fkwmy06ldrl064pbx57ky0wnw"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; - tuber = derive2 { name="tuber"; version="0.1"; sha256="18cay5i0jxx0355a6dahppf2pzb3bq7pmfcy0m74m3f2n2cnayiv"; depends=[httr]; }; + tuber = derive2 { name="tuber"; version="0.2"; sha256="1frxjk1yzzcn7sza21qn2905z60vpi9b142jxnslncm2dpd2fh65"; depends=[httr]; }; + tufte = derive2 { name="tufte"; version="0.2"; sha256="0yh5xdxapqpf5hgdn8c2jkk63817l2w6bxavw8457r89rnj1022p"; depends=[htmltools knitr rmarkdown]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; }; - tumgr = derive2 { name="tumgr"; version="0.0.3"; sha256="0g24mhz63s9kwinicrkh10j4srwq7x6s1qjn0apnj71ma1ndaad3"; depends=[minpack_lm]; }; + tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; tuneR = derive2 { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; }; turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; }; turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; + tutorial = derive2 { name="tutorial"; version="0.2.2"; sha256="0594pgjkx2y14gy54vfccwn30w2szdq1q4l85frjbjf7k2z88x4b"; depends=[markdown rmarkdown]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; }; twang = derive2 { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; }; tweedie = derive2 { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; }; - tweet2r = derive2 { name="tweet2r"; version="0.3"; sha256="0vrgbkdjp19q53m34spvzkahk0123wx8wfqj84vz9b7qwjj9hvc8"; depends=[ggmap ggplot2 plyr rgdal ROAuth RPostgreSQL RSQLite sp streamR]; }; + tweenr = derive2 { name="tweenr"; version="0.1.2"; sha256="1s1q9adqdff79bpr2ypfzbsh51kmzqxk2082s49pw5kmina6bacs"; depends=[Rcpp]; }; + tweet2r = derive2 { name="tweet2r"; version="0.4.1"; sha256="0g2y6bs9211wrn8gaqxcrzka27aqh2wcxi00faqkw61pypy4fyxg"; depends=[ggmap ggplot2 plyr rgdal ROAuth RPostgreSQL RSQLite sp streamR]; }; twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; }; twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; }; @@ -7508,16 +7854,16 @@ in with self; { udunits2 = derive2 { name="udunits2"; version="0.8.1"; sha256="0nind45v0ispwz0fgksw64w4y5y6za0r3cx07j02zwg911n32r7c"; depends=[]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; }; ump = derive2 { name="ump"; version="0.5-6"; sha256="1nd6miz9scc6llckafl73pxiqh0ycfhlsmn2l0swcvjxpj3kb0zv"; depends=[]; }; - umx = derive2 { name="umx"; version="1.1.0"; sha256="0dz80260m75in3cz50sqhhsm54k3d36aghsgyd3f93i9gxbgnwy5"; depends=[formula_tools MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl]; }; + umx = derive2 { name="umx"; version="1.1.5"; sha256="13diwb8p51vh14pb705sbdn2994ha4dfx20s45aj38sqz7igz2x4"; depends=[knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; unfoldr = derive2 { name="unfoldr"; version="0.3"; sha256="1zc2a4c228lhflsiypn8z6yn3fl0hr3dpmpzdxfrrijzbfai9215"; depends=[]; }; uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; uniReg = derive2 { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; - uniah = derive2 { name="uniah"; version="0.3"; sha256="15cc82kkli9p5nxg9yjn77ipphmsf7bw1j372svvcacv9j6f6nml"; depends=[ahaz Iso survival]; }; + uniah = derive2 { name="uniah"; version="0.4"; sha256="1ryfqkry06xhvjls6hrnggd43x4kbah38xxgrb7bjcwl1r25y2n0"; depends=[ahaz Iso survival]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; - uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-0"; sha256="0fizkxxppq00ngqvag4zbk6x7jpv6blgjr3w4p5iqc5p615z2yrb"; depends=[]; }; + uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-2"; sha256="15d6s44n1cvhpjsmwjly3nqq7q2zpi2ws6cw5jrxb97gacma896n"; depends=[]; }; unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; }; unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; unmarked = derive2 { name="unmarked"; version="0.11-0"; sha256="0n5cm17ns464dxd9sdma6f12x1phnvv05aiwgxsj499lk6jazf0l"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; }; @@ -7525,14 +7871,14 @@ in with self; { upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; - urca = derive2 { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; }; - urlshorteneR = derive2 { name="urlshorteneR"; version="0.8.8"; sha256="1zxyr946a57hxm2gw3lyl6apzxfl7b2vinlav6yzsi34f7gv0i97"; depends=[httr jsonlite stringr]; }; + urca = derive2 { name="urca"; version="1.2-9"; sha256="0x4mrqqr3hfgf3vy60wz4dngy188di8xccryhck9jqjryzj35i6g"; depends=[nlme]; }; urltools = derive2 { name="urltools"; version="1.3.2"; sha256="0kzjvvllzp51jnvxh70hilh843shi73jxjq2cg8sq6zbp22wv75q"; depends=[Rcpp]; }; + uroot = derive2 { name="uroot"; version="2.0-5"; sha256="1402s52924vas3h37sb6q3qqff9kk79ynq6s3hgz200klxlbvyxk"; depends=[]; }; usdm = derive2 { name="usdm"; version="1.1-15"; sha256="1638fv8if7pcnm6y44w3vbmivgcg4a577zd2jwhmp00vrwml2a9m"; depends=[raster sp]; }; - useful = derive2 { name="useful"; version="1.1.9"; sha256="1b2dbzfc8dpbhhy8198kch3pdisnsjdfngb1sb2hb38jrj90sa32"; depends=[dplyr ggplot2 magrittr plyr scales]; }; - userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[car fBasics foreign GGally ggplot2 GPArotation knitr lavaan ltm MASS MBESS mosaic plyr psych pwr SuppDists xtable]; }; + useful = derive2 { name="useful"; version="1.2.0"; sha256="0k701namh9svdb9ag33vr44af9g07nnd8mqrcd8zm512a6clmyx9"; depends=[dplyr ggplot2 magrittr plyr scales]; }; + userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.4-1"; sha256="1nfj7rydrjwpxvqxxa4996957r2d618h49jy6554f2k3ih0bryaj"; depends=[car fBasics foreign GGally ggplot2 GPArotation gridExtra knitr lavaan MASS MBESS mosaic plyr psych pwr SCRT SuppDists xtable]; }; uskewFactors = derive2 { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; - usl = derive2 { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; }; + usl = derive2 { name="usl"; version="1.5.0"; sha256="09gv2r44nnyvf2pvdqmk7whqvivvs67w5lk8kw72zb8y6gsjag57"; depends=[nlmrt]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utility = derive2 { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; }; uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; @@ -7544,28 +7890,31 @@ in with self; { varSelRF = derive2 { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; }; varbvs = derive2 { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.4.8"; sha256="166dh61wvrk0hiki38y6vifgr03x5gjiijbmnhd68mcgqavcs9cx"; depends=[data_table foreach gdata laeken MASS plyr stringr]; }; varhandle = derive2 { name="varhandle"; version="1.0.0"; sha256="1bpnzgx7gz95pgn13w7z5gq2lyhm549mc5697kx0625hpk13gddj"; depends=[]; }; - varian = derive2 { name="varian"; version="0.2.1"; sha256="1rk8pmqkbsvjsfz704dawvqrqxdvbnql8sjwv0z38f9kgwvqh5p7"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; + variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; }; + varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; }; vartors = derive2 { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive2 { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; }; - vcdExtra = derive2 { name="vcdExtra"; version="0.6-12"; sha256="0j4zlalbhf31ybyxyby2551xdfndxshwm8n8d35rgz47rjj86fyi"; depends=[gnm MASS vcd]; }; - vcrpart = derive2 { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; - vdg = derive2 { name="vdg"; version="1.1.2"; sha256="1kifcsy5kp4casxa49hghlff1cqfz8syql6pfg9d5214h1hnha04"; depends=[ggplot2 gridExtra proxy quantreg]; }; - vdmR = derive2 { name="vdmR"; version="0.2.1"; sha256="10b1nh26r8x01v1m823issz9ihbphaa1sv12vj0yv82vs0vr808k"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; }; + vcdExtra = derive2 { name="vcdExtra"; version="0.7-0"; sha256="0ggkv0khn9h6b787dnmkk38fkxgp84k4nn1c3gm12i7n47r58ygr"; depends=[ca gnm MASS vcd]; }; + vcfR = derive2 { name="vcfR"; version="1.0.0"; sha256="0dlypblqa966lgcib3w6sw357w1mdq3nlp9f0c6846alh952j4v4"; depends=[ape memuse Rcpp]; }; + vcrpart = derive2 { name="vcrpart"; version="0.4-1"; sha256="1wrbjxh4kvz6yll9d002y3vpz9p8fa1lmqqvyz3w2nnwq4s9r4hc"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; + vdg = derive2 { name="vdg"; version="1.1.3"; sha256="07lk6q0iqszwcxzbkkyk9ywcs4lxi14w6j3crgd0xvr5x6kh3qcz"; depends=[ggplot2 gridExtra proxy quantreg]; }; + vdmR = derive2 { name="vdmR"; version="0.2.2"; sha256="1z7m7myv6wpmd8i7v5b1r7n4zmjawbj5i5r27jiqw9id33xn1qpi"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; - vegan = derive2 { name="vegan"; version="2.3-2"; sha256="1b29hbfac736yl53n04ran8ygd6l49vvpd6800wxsq8qpvp18nn6"; depends=[cluster lattice MASS mgcv permute]; }; + vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; + vegan = derive2 { name="vegan"; version="2.3-4"; sha256="1nggyj8nmm9vf3cj4ldyjand5qmpqbkqypwdrk00lrr18ilfpvxr"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.0-0"; sha256="0g9plc9ba51qva5vaa82xkn0izrha44pvsvkh2ppcwgqyaiv9xsd"; depends=[rgl scatterplot3d vegan]; }; vegclust = derive2 { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[sp vegan]; }; - vegdata = derive2 { name="vegdata"; version="0.8.6"; sha256="1drxsz1135q9raz18a7bzs8q4hn2j6fzca6gba8qx7ik2257pjjh"; depends=[foreign httr jsonlite XML]; }; + vegdata = derive2 { name="vegdata"; version="0.8.9"; sha256="1hv8l2ynzxmpjq438zqhk59sgiwkvgvqdgp7z0dpx24x6q5rzw6s"; depends=[foreign httr jsonlite XML]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; + venn = derive2 { name="venn"; version="1.1"; sha256="0anpzavc1pppxb95186v7plr3skv2achhpkc1yav2nx0jhsd5i9h"; depends=[]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; }; - versions = derive2 { name="versions"; version="0.1"; sha256="0i10fbhq4sfd6jkm7n5almfqz84cn4dsal0paaflrvy097yya69x"; depends=[]; }; + versions = derive2 { name="versions"; version="0.2"; sha256="0kfbsl2wzwaw7v3vd407zaahkslpm51mp68w87m72nvsqlbhiixw"; depends=[]; }; vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; vines = derive2 { name="vines"; version="1.1.4"; sha256="18nsxbi8s325l1bbhqn1y5nx1zdbbfwdlb6bv1xxnc1504sf5xz2"; depends=[ADGofTest copula cubature TSP]; }; @@ -7573,31 +7922,34 @@ in with self; { vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; vipor = derive2 { name="vipor"; version="0.3.2"; sha256="12c4f2f5h6na24dra4sj3p8jssswnx6mx60a9ir8mh584npqjhmp"; depends=[]; }; - viridis = derive2 { name="viridis"; version="0.3.2"; sha256="06hfifi0waz21nndgvwsczn1vk4kvvis05hs382clycyl9qcfxf7"; depends=[ggplot2 gridExtra]; }; - viridisLite = derive2 { name="viridisLite"; version="0.1.1"; sha256="0cgkp20la0g3qxs716fi2k4ir6awqw0h9mh89s0j4v80za9qcip7"; depends=[]; }; + viridis = derive2 { name="viridis"; version="0.3.4"; sha256="1a9hqn2pccpc51vh8ghw698ni6xzdnp8v0n8kgjh51nlz5hhc87j"; depends=[ggplot2 gridExtra]; }; + viridisLite = derive2 { name="viridisLite"; version="0.1.3"; sha256="1b0fhj8i1m9jsz91gzag60k7vy7kk5xkdg31rc3h3spq96l66psp"; depends=[]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; }; - visNetwork = derive2 { name="visNetwork"; version="0.2.0"; sha256="0id6j05ddx0jhsc46dzlpdz0zfjwfpfcxhlb3gixivls7c9vibnv"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; - visreg = derive2 { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; }; - visualFields = derive2 { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; }; + visNetwork = derive2 { name="visNetwork"; version="0.2.1"; sha256="1jyxkl0d1r7iqw180xb82nykix4w035pxgbvvvl3x5d0bg1892p6"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; + visreg = derive2 { name="visreg"; version="2.2-2"; sha256="04i7908cqjwqlcggp5fv6w21kp4bhkn0ggy0qw3ff7pfs6dz66x4"; depends=[lattice]; }; + visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; }; visualize = derive2 { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; - vitality = derive2 { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; }; + vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; }; vmsbase = derive2 { name="vmsbase"; version="2.1"; sha256="0fz4hv08w7bpg906624d5gasd6cnqdsx9pp4194xqvsiygzl4zc4"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; }; + vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; vows = derive2 { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 mgcv oro_nifti RLRsim rpanel shape stringr]; }; + vqtl = derive2 { name="vqtl"; version="1.0"; sha256="0zlli79rhcbbjkkf4kjjkscx7vk6kspma5qgywxdiyhkxiq8j2x5"; depends=[dglm dplyr evd gtools plyr qtl RColorBrewer scales stringr]; }; + vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; - vtreat = derive2 { name="vtreat"; version="0.5.21"; sha256="0rnsz939brshaipd730pmyv7d88r92x5dlz56m7x2pdd3w46y272"; depends=[]; }; - vudc = derive2 { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn40qj1fkzwnzqz70czc2msppw"; depends=[]; }; + vtreat = derive2 { name="vtreat"; version="0.5.22"; sha256="0wgr7k025iylvv3l4pdwsqrblqimmgf5m7lmmb2ns0lg9m62anrp"; depends=[]; }; + vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; - wBoot = derive2 { name="wBoot"; version="1.0.1"; sha256="1yh89iqfv0qlalasg2a1fn0riqy49zy4wnvywqdh3qs369rmyaw5"; depends=[boot simpleboot]; }; + wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; }; wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; }; wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; }; waffle = derive2 { name="waffle"; version="0.5.0"; sha256="0f5gw487vjpaa9rl6x9p1qxvp9rn4s8p4x58y5azalya6v4hyw6y"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; }; wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; - wakefield = derive2 { name="wakefield"; version="0.2.0"; sha256="0pjc0j6hghld3izl6i8q5iylly3wcvmdl9qmg5kjig7751ky7xp4"; depends=[chron dplyr ggplot2 stringi]; }; + wakefield = derive2 { name="wakefield"; version="0.2.1"; sha256="08277iwxgykxbcp1c7ys03vm0amfba7pki0ss69zl0ljv92bgsj9"; depends=[chron dplyr ggplot2 stringi]; }; walkr = derive2 { name="walkr"; version="0.3.3"; sha256="0gyfhpar667ni5g8g0fwq4zgia3xkf5k9knhgvycq8jf554yxyl6"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; warbleR = derive2 { name="warbleR"; version="1.1.0"; sha256="1zzv9s6i1884j2iybn5bwlyrnzw4ry1s9mvcpq10608nv6bg68pb"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; }; @@ -7616,36 +7968,37 @@ in with self; { weatherData = derive2 { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.0"; sha256="1zhcgpr9r5bhg88mk13k5bskm2q4kw88dh3gphlha5j6yf2zsq6r"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; - webchem = derive2 { name="webchem"; version="0.0.4.0"; sha256="15v9b43c2c949i0clcw2z3xwmwz02sxd1wby377rzmmqans2bp9s"; depends=[httr jsonlite RCurl stringr XML xml2]; }; + webchem = derive2 { name="webchem"; version="0.1.0.0"; sha256="04w827a3n91avqvnh28dmi5p13ijnmr43qx13p2z1zkr3ashqrnm"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; webp = derive2 { name="webp"; version="0.2"; sha256="1nwb30wyff5jynn0ppmg5ybw6q2ha9smnk69fi182grm3znf85as"; depends=[]; }; - webreadr = derive2 { name="webreadr"; version="0.3.0"; sha256="1xbp1mmqabl9kdg07ysqva5rxfm59q698hm8av481hd3ggcqvv98"; depends=[Rcpp readr]; }; + webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; + webshot = derive2 { name="webshot"; version="0.3"; sha256="12gp81kr96hal8wqh6afc01g9sk36m18j00c093z15sxhgd4wgkn"; depends=[magrittr]; }; webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; }; webutils = derive2 { name="webutils"; version="0.4"; sha256="1y8xs2kyf8g4mqpxp0kwb47cidmaqs4n3ysiy7p4s35imhzi16dc"; depends=[jsonlite]; }; webvis = derive2 { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; wec = derive2 { name="wec"; version="0.1"; sha256="0mg310v066k52g3isxmsgda44sys4pdl9365470z61c7dz2smy5q"; depends=[]; }; weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; }; weightedScores = derive2 { name="weightedScores"; version="0.9.5.1"; sha256="118hzwaarcb8pk2zz83m6zzzndlpbbzb7gz87vc7zggpa998k1gr"; depends=[mvtnorm rootSolve]; }; - weights = derive2 { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[gdata Hmisc]; }; + weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; }; wfe = derive2 { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; }; + wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wgaim = derive2 { name="wgaim"; version="1.4-10"; sha256="0wf6j7f7hn2cnsb9yi28rjl7sa60zjggg62i00039b7gxcznxj1r"; depends=[lattice qtl]; }; wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; }; whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; whoami = derive2 { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; }; - whoapi = derive2 { name="whoapi"; version="0.1.0"; sha256="01hi47da4i482ma7fzyk7ivs0xalinh7g9hjkynk9kr7xq1dj8ci"; depends=[httr]; }; + whoapi = derive2 { name="whoapi"; version="0.1.1"; sha256="0f4szsb30hzihwc5p48f3pi5lvdbchbkynj49drjcdhzds5hwma7"; depends=[httr]; }; widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; - wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.7"; sha256="0qsxgzpn3jalwc4rm3dizn7mnwwbiydlpzxkps1pq37srb97zwsn"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; + wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; }; - wildpoker = derive2 { name="wildpoker"; version="1.0"; sha256="17sr166cnvlvbm7znf822lsvaybcpm0q2nzf8c9nir968yh11kyf"; depends=[]; }; + wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; - withr = derive2 { name="withr"; version="1.0.0"; sha256="1833ln4z04v62lymjcwhqf8zf6r8i6bmk8w376xaia99wssh0vfz"; depends=[]; }; - witness = derive2 { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; }; + withr = derive2 { name="withr"; version="1.0.1"; sha256="0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.2-0"; sha256="04mljw7mw6cgmvzhcqw15pmqbmm61w8ylgh9f4r4k23c4qcpbmjl"; depends=[sp]; }; wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; @@ -7655,32 +8008,36 @@ in with self; { wordbankr = derive2 { name="wordbankr"; version="0.1"; sha256="0r2wv2vpf4xpalhpnfkyg4qznd83m8nz105xiq5dhwfx78wzvsyr"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; - wordnet = derive2 { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nxs66hvqic9zbxf63sshszgpva2cqlyj4q8"; depends=[rJava]; }; + wordnet = derive2 { name="wordnet"; version="0.1-11"; sha256="0c04wda7im5jzvsb3bhql2krlpvbsv7cc5gdw3dshfqz33knyy9i"; depends=[rJava]; }; wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; wpp2015 = derive2 { name="wpp2015"; version="1.0-1"; sha256="1vm194b4zccg9sldsmjaf5a95zr5lrdbbg1iwby5a6w06v7g5762"; depends=[]; }; wppExplorer = derive2 { name="wppExplorer"; version="1.7-1"; sha256="1scxvx0kl1s9yhwrynd65c73b6q3lrz9n26kxcw2zwfzb0c5i1j7"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2015]; }; - wq = derive2 { name="wq"; version="0.4.5"; sha256="1hlnv0cdwixpny736wfqww5iv14s5cw95jwcpy0yrx556jpvx3qm"; depends=[ggplot2 reshape2 zoo]; }; + wq = derive2 { name="wq"; version="0.4.6"; sha256="1j5ghd40dzai647v44kxinqc5wx7bsc93sgxd9f3hb6h4ggfj1ka"; depends=[ggplot2 knitr reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrassp = derive2 { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; }; wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; - wru = derive2 { name="wru"; version="0.0-1"; sha256="1bl4fni44rapv1z1smjgg07hanhzhkiw0hrmw5g1qfzs0h7kwjk0"; depends=[]; }; + wrswoR = derive2 { name="wrswoR"; version="1.0-1"; sha256="1czw3g2j6as024wwvxiizvvxjmsxmxhz86jbw2lh95nh61znb7l8"; depends=[logging Rcpp]; }; + wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.1-1"; sha256="1a2ymyf1yww43i79hc912jpyqvbx44qn5bfnjwf4hq3mp707731j"; depends=[curl lazyeval]; }; + wru = derive2 { name="wru"; version="0.0-2"; sha256="0k8dsih952jkigl1b0f1gbc475jm9926k4gx8sjnx433asda1maa"; depends=[devtools]; }; wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.5.29"; sha256="1lp1yv5p2c0yq8znwzwj76gri02ip3zh0vzidlzi2fz4vh3z5ck3"; depends=[Rcpp]; }; wtcrsk = derive2 { name="wtcrsk"; version="1.6"; sha256="048gs469rdj85sid1gfj6yhh37w7zf9xv4fj8pd48c8ww3v7f61p"; depends=[]; }; - wux = derive2 { name="wux"; version="2.1-1"; sha256="02q9hb9vvw5bw3ficsw40zqkpiwkm9ydilzs7kpw1xw7mll3jr7x"; depends=[abind class corpcor fields gdata Hmisc ncdf reshape rgdal rgeos rworldmap sp stringr]; }; + wux = derive2 { name="wux"; version="2.2-0"; sha256="1sfx1mh4pb5xxkij5738r69cr8h32h1g6004k3s5lk6s8s0rs349"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; x_ent = derive2 { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5w83kq9qvpw0pk56lsc1bafps712p"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; }; x12 = derive2 { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; - xergm = derive2 { name="xergm"; version="1.5.3"; sha256="0m12k4876zada4ibnfjvnzrdqp0ridbnrgd7fl8x3k5hvqzv2pni"; depends=[btergm tnam xergm_common]; }; - xergm_common = derive2 { name="xergm.common"; version="1.6"; sha256="0qd171gl9a8k4rs4qp0px995wv36srsypcp10fr4cmwab0wwxv4z"; depends=[ergm network]; }; - xgboost = derive2 { name="xgboost"; version="0.4-2"; sha256="1m6jv1ww0cxqg87kq412akcwimj6i7ncg7anrbfhbq2h5v53brak"; depends=[data_table magrittr Matrix stringr]; }; + x13binary = derive2 { name="x13binary"; version="0.1.2"; sha256="1cvbqbg9bck9dlsj929wysg8frkc70p0hwpwy1rj4qwyw8czi4bs"; depends=[]; }; + xVA = derive2 { name="xVA"; version="0.8"; sha256="05hw886pdi0gqvv3x3nn4a757nfc6cc6p3z8p4lp5f72ynbrlia8"; depends=[SACCR]; }; + xergm = derive2 { name="xergm"; version="1.7.0"; sha256="04ng0mdlzc182ijn0c7ln7zscm9w4631vhzqzhfayjf3ik264nns"; depends=[btergm rem tnam xergm_common]; }; + xergm_common = derive2 { name="xergm.common"; version="1.7.1"; sha256="0l8jjz883358w704lw7rrr1z8pxk5fj78rgamsh942d0m9yp4lls"; depends=[ergm network]; }; + xgboost = derive2 { name="xgboost"; version="0.4-3"; sha256="1gq8h03hpvm2w7ninb4qpbyl9h1gvwjzcz9jnnwi0dnqknm5b26q"; depends=[data_table magrittr Matrix stringr]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; - xkcd = derive2 { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[extrafont ggplot2 Hmisc]; }; + xkcd = derive2 { name="xkcd"; version="0.0.5"; sha256="1cq4n7w4adj24qq658z15jkqvrn4pd5abxpcsdkzb2cq98m69iis"; depends=[extrafont ggplot2 Hmisc]; }; xlsx = derive2 { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; xmeta = derive2 { name="xmeta"; version="1.0-2"; sha256="0b6swqlhiyhkwh5d0rvn1r9bslhnxx34yfw37l1m0bx9cndcalkz"; depends=[aod glmmML metafor mvmeta numDeriv]; }; @@ -7688,20 +8045,20 @@ in with self; { xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; }; xpose4 = derive2 { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[gam Hmisc lattice survival]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xtable = derive2 { name="xtable"; version="1.8-0"; sha256="19l27zic0ynywdhr8z6skbl0qdlyys8bayl0dv2g5q5bliif69ak"; depends=[]; }; + xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; }; - yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.0"; sha256="1shg5hg60rabvjxcz12f67nzi8vr0z8g74haznf3qxx1nkj32gsg"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; }; + yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.2"; sha256="130zp8na3d50b49bcsqzsmjy2sif865h6vfpc5zmp1fhvkyykkfd"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; }; yaImpute = derive2 { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; }; yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; yaml = derive2 { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; }; ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; }; - yhatr = derive2 { name="yhatr"; version="0.13.7"; sha256="1n4n8v8qz3isvg8g1cwh0xz83g65n01x9pwzbxzvqidw5ip4ybb0"; depends=[httr jsonlite plyr RCurl rjson stringr]; }; + yhatr = derive2 { name="yhatr"; version="0.13.10"; sha256="1hlab1x44xld634ha36y66znfpl3a8v77281c07i954d9sqm893p"; depends=[httr jsonlite rjson stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; - yuima = derive2 { name="yuima"; version="1.0.77"; sha256="1jds6l33sjnf4yhhl8rig0pzsn7cwrv9pmxqs34l9sildppjmn61"; depends=[cubature expm mvtnorm zoo]; }; + yuima = derive2 { name="yuima"; version="1.0.81"; sha256="171ma8j8x7adwfiixihjp6bwg7w5xij38fvmkazsxd39aw7gkz7z"; depends=[cubature expm mvtnorm zoo]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; zCompositions = derive2 { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; @@ -7712,10 +8069,10 @@ in with self; { zoeppritz = derive2 { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.3.3"; sha256="0j183jyx9qirdyg03rpv6q30rxbb68cs6g2qpi53arpfk2v9f445"; depends=[abind coda Formula matrixcalc rjags]; }; zoo = derive2 { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; }; - zooaRch = derive2 { name="zooaRch"; version="1.1"; sha256="1a4cbayw5qj9wp925g06a1djiravh7yg3w7vdxzaks5a16pwv5li"; depends=[ggplot2]; }; + zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; zooimage = derive2 { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; - zoon = derive2 { name="zoon"; version="0.4.21"; sha256="08nsyxz6kdnb0qs0y5n0n8m7gkxf52kxkc5n59sbny0gnnr16hnh"; depends=[dismo raster RCurl rfigshare]; }; + zoon = derive2 { name="zoon"; version="0.4.23"; sha256="0y8jmlqfdnf5j7dzcz2y4dspxlzl6nvsa9ly97myg461ypicm8sc"; depends=[dismo raster RCurl rfigshare]; }; ztable = derive2 { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 68e9fc6b45854..955dd9ed667d4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -46,6 +46,14 @@ let mkHomepage = {name, rVersion}: "https://bioconductor.org/packages/${rVersion}/bioc/html/${name}.html"; mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/bioc/src/contrib/${name}_${version}.tar.gz" ]; }; + deriveBiocAnn = mkDerive { + mkHomepage = {name, rVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; + }; + deriveBiocExp = mkDerive { + mkHomepage = {name, rVersion}: "http://www.bioconductor.org/packages/${name}.html"; + mkUrls = {name, version, rVersion}: [ "mirror://bioc/${rVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; + }; deriveCran = mkDerive { mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ]; @@ -213,6 +221,8 @@ let # packages in `_self` may depends on overridden packages. self = (defaultOverrides _self self) // overrides; _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } // + import ./bioc-annotation-packages.nix { inherit self; derive = deriveBiocAnn; } // + import ./bioc-experiment-packages.nix { inherit self; derive = deriveBiocExp; } // import ./cran-packages.nix { inherit self; derive = deriveCran; } // import ./irkernel-packages.nix { inherit self; derive = deriveIRkernel; }; @@ -267,7 +277,6 @@ let mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw ]; ncdf4 = [ pkgs.netcdf ]; - ncdf = [ pkgs.netcdf ]; nloptr = [ pkgs.nlopt ]; openssl = [ pkgs.openssl ]; outbreaker = [ pkgs.gsl_1 ]; @@ -300,7 +309,6 @@ let RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; Rhtslib = [ pkgs.zlib ]; - ridge = [ pkgs.gsl_1 ]; RJaCGH = [ pkgs.zlib ]; rjags = [ pkgs.jags ]; rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ]; @@ -329,7 +337,6 @@ let SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw pkgs.libsndfile ]; - SemiCompRisks = [ pkgs.gsl_1 ]; seqinr = [ pkgs.zlib ]; seqminer = [ pkgs.zlib pkgs.bzip2 ]; showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ]; @@ -355,6 +362,20 @@ let XBRL = [ pkgs.zlib pkgs.libxml2 ]; xml2 = [ pkgs.libxml2 ]; XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ]; + affyPLM = [ pkgs.zlib ]; + bamsignals = [ pkgs.zlib ]; + BitSeq = [ pkgs.zlib ]; + DiffBind = [ pkgs.zlib ]; + ShortRead = [ pkgs.zlib ]; + oligo = [ pkgs.zlib ]; + gmapR = [ pkgs.zlib ]; + Rsubread = [ pkgs.zlib ]; + XVector = [ pkgs.zlib ]; + Rsamtools = [ pkgs.zlib ]; + rtracklayer = [ pkgs.zlib ]; + affyio = [ pkgs.zlib ]; + VariantAnnotation = [ pkgs.zlib ]; + snpStats = [ pkgs.zlib ]; }; packagesWithBuildInputs = { @@ -398,6 +419,7 @@ let adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ]; + mzR = [ pkgs.netcdf ]; }; packagesRequireingX = [ @@ -674,1624 +696,1100 @@ let # Packages which cannot be installed due to lack of dependencies or other reasons. brokenPackages = [ - "a4Base" # depends on broken package annaffy-1.41.1 - "a4Classif" # broken build - "a4Core" # broken build - "a4" # depends on broken package annaffy-1.41.1 - "a4Preproc" # broken build - "a4Reporting" # depends on broken package annaffy-1.41.1 - "ABAEnrichment" # broken build - "ABarray" # broken build - "abd" # depends on broken package nlopt-2.4.2 - "aCGH" # broken build - "ACME" # broken build - "Actigraphy" # Build Is Broken - "adabag" # depends on broken package nlopt-2.4.2 - "ADaCGH2" # depends on broken package tilingArray-1.47.0 - "adhoc" # broken build - "adSplit" # build is broken - "AER" # depends on broken package nlopt-2.4.2 - "afex" # depends on broken package nlopt-2.4.2 - "AffyCompatible" # broken build - "affycomp" # broken build - "affyContam" # depends on broken package affyio-1.37.0 - "affycoretools" # depends on broken package affyio-1.37.0 - "affy" # depends on broken package affyio-1.37.0 - "AffyExpress" # depends on broken package affyio-1.37.0 - "affyILM" # depends on broken package affyio-1.37.0 - "affyio" # build is broken - "affylmGUI" # depends on broken package affyio-1.37.0 - "affyPara" # depends on broken package affyio-1.37.0 - "affypdnn" # depends on broken package affyio-1.37.0 - "affyPLM" # depends on broken package affyio-1.37.0 - "affyQCReport" # depends on broken package affyio-1.37.0 - "AffyRNADegradation" # depends on broken package affyio-1.37.0 - "AffyTiling" # depends on broken package affyio-1.37.0 - "AGDEX" # broken build - "AgiMicroRna" # depends on broken package affyio-1.37.0 - "agRee" # depends on broken package nlopt-2.4.2 - "AIMS" # broken build - "ALDEx2" # broken build - "aLFQ" # depends on broken package nlopt-2.4.2 - "algstat" # broken build - "AllelicImbalance" # depends on broken package Rsamtools-1.21.8 - "alr3" # depends on broken package nlopt-2.4.2 - "alr4" # depends on broken package nlopt-2.4.2 - "alsace" # depends on broken nloptr-1.0.4 - "altcdfenvs" # depends on broken package affyio-1.37.0 - "ampliQueso" # depends on broken package Rsamtools-1.21.8 - "anacor" # depends on broken package nlopt-2.4.2 - "AnalysisPageServer" # broken build + "TED" # depends on broken package animation + "streamMOA" # depends on broken package animation + "stream" # depends on broken package animation + "spdynmod" # depends on broken package animation + "treeplyr" # depends on broken package animation + "recluster" # depends on broken package animation + "geomorph" # depends on broken package animation + "phytools" # depends on broken package animation "animation" # broken build + "srd" # broken build + "paleotree" # broken build + "ndtv" # broken build + "mvMORPH" # broken build + "mptools" # broken build + "monogeneaGM" # broken build + "molaR" # broken build + "idm" # broken build + "hisse" # broken build + "gfcanalysis" # broken build + "evolqg" # broken build + "evobiR" # broken build + "convevol" # broken build + "bayou" # broken build "anim_plots" # broken build - "annaffy" # build is broken - "annmap" # depends on broken package Rsamtools-1.21.8 - "annotate" # broken build - "AnnotationDbi" # broken build - "AnnotationForge" # Build Is Broken - "AnnotationFuncs" # broken build - "AnnotationHubData" # depends on broken package r-AnnotationForge-1.11.19 - "AnnotationHub" # depends on broken package interactiveDisplayBase-1.7.0 - "annotationTools" # broken build - "anota" # broken build - "aods3" # depends on broken package nlopt-2.4.2 - "aop" # broken build - "apaTables" # depends on broken package r-car-2.1-0 - "apComplex" # build is broken - "apex" # depends on broken package Biostrings-2.38.2 - "apmsWAPP" # broken build - "apt" # depends on broken package nlopt-2.4.2 - "ArfimaMLM" # depends on broken package nlopt-2.4.2 - "arm" # depends on broken package nlopt-2.4.2 - "ArrayBin" # broken build - "ArrayExpress" # depends on broken package affyio-1.37.0 - "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8 - "arrayMvout" # depends on broken package affyio-1.37.0 - "arrayQualityMetrics" # depends on broken package affyio-1.37.0 - "ArrayTools" # depends on broken package affyio-1.37.0 - "ArrayTV" # depends on broken package affyio-1.37.0 - "ARRmNormalization" # Build Is Broken - "ART" # depends on broken package ar-car-2.1-0 - "ARTool" # depends on broken package nlopt-2.4.2 + "TKF" # broken build + "Rphylopars" # broken build + "RAM" # broken build + "PhySortR" # broken build + "MonoPhy" # broken build + "Momocs" # broken build + "Evomorph" # broken build + "PBD" # depends on broken package DDD + "DDD" # broken build + "BMhyd" # broken build + "rscala" # broken build + "rgpui" # depends on broken package rgp + "rgp" # broken build + "qcmetrics" # broken build + "lfe" # broken build + "interactiveDisplay" # depends on broken package interactiveDisplayBase + "RefNet" # depends on broken package interactiveDisplayBase + "pwOmics" # depends on broken package interactiveDisplayBase + "grasp2db" # depends on broken package interactiveDisplayBase + "EnsDb_Rnorvegicus_v79" # depends on broken package interactiveDisplayBase + "EnsDb_Rnorvegicus_v75" # depends on broken package interactiveDisplayBase + "EnsDb_Mmusculus_v79" # depends on broken package interactiveDisplayBase + "EnsDb_Mmusculus_v75" # depends on broken package interactiveDisplayBase + "EnsDb_Hsapiens_v79" # depends on broken package interactiveDisplayBase + "EnsDb_Hsapiens_v75" # depends on broken package interactiveDisplayBase + "ensembldb" # depends on broken package interactiveDisplayBase + "AnnotationHubData" # depends on broken package interactiveDisplayBase + "AnnotationHub" # depends on broken package interactiveDisplayBase + "interactiveDisplayBase" # broken build + "h2o" # broken build + "funModeling" # broken build + "brr" # broken build + "bedr" # broken build + "Sabermetrics" # broken build + "RKEEL" # depends on broken package RKEELjars + "RKEELjars" # broken build + "RapidPolygonLookup" # depends on broken package PBSmapping + "PBSmapping" # broken build + "stagePop" # depends on broken package PBSddesolve + "PBSddesolve" # broken build + "Metab" # broken build + "Crossover" # broken build + "CardinalWorkflows" # broken build + "spoccutils" # depends on broken package spocc + "mapr" # depends on broken package spocc + "vmsbase" # broken build + "vcfR" # broken build + "strataG" # broken build + "SSDM" # broken build + "SimInf" # broken build + "shazam" # broken build + "rsvg" # broken build + "Rothermel" # broken build + "rfPermute" # broken build + "redland" # broken build + "RAppArmor" # broken build + "permGPU" # broken build + "pdftools" # broken build + "OceanView" # broken build + "MSeasyTkGUI" # broken build + "mrMLM" # broken build + "MonetDBLite" # broken build + "MixGHD" # broken build + "LCMCR" # broken build + "hunspell" # broken build + "googleformr" # broken build + "ggseas" # depends on broken package x13binary + "seasonal" # depends on broken package x13binary + "gunsales" # depends on broken package x13binary + "x13binary" # broken build + "fds" # broken build + "exifr" # broken build + "rite" # depends on broken package euroMix + "MBCB" # depends on broken package euroMix + "forensim" # depends on broken package euroMix + "dynBiplotGUI" # depends on broken package euroMix + "cncaGUI" # depends on broken package euroMix + "biplotbootGUI" # depends on broken package euroMix + "AnthropMMD" # depends on broken package euroMix + "ilc" # depends on broken package demography + "demography" # broken build + "webbioc" # depends on broken package limma + "davidTiling" # depends on broken package limma + "tilingArray" # depends on broken package limma + "NAPPA" # depends on broken package limma + "NanoStringNorm" # depends on broken package limma + "synapterdata" # depends on broken package limma + "synapter" # depends on broken package limma + "RforProteomics" # depends on broken package limma + "pRolocdata" # depends on broken package limma + "ProCoNA" # depends on broken package limma + "Pbase" # depends on broken package limma + "MSnID" # depends on broken package limma + "msmsEDA" # depends on broken package limma + "MSnbase" # depends on broken package limma + "staRank" # depends on broken package limma + "phenoDist" # depends on broken package limma + "imageHTS" # depends on broken package limma + "Mulder2012" # depends on broken package limma + "HTSanalyzeR" # depends on broken package limma + "gespeR" # depends on broken package limma + "cellHTS2" # depends on broken package limma + "affyPara" # depends on broken package limma + "vsn" # depends on broken package limma + "ttScreening" # depends on broken package limma + "metaX" # depends on broken package limma + "SSPA" # depends on broken package limma + "SQDA" # depends on broken package limma + "ADaCGH2" # depends on broken package limma + "snapCGH" # depends on broken package limma + "Shrinkage" # depends on broken package limma + "SafeQuant" # depends on broken package limma + "RTopper" # depends on broken package limma + "RTCGAToolbox" # depends on broken package limma + "RPPanalyzer" # depends on broken package limma + "Rnits" # depends on broken package limma + "RNAinteractMAPK" # depends on broken package limma + "RNAinteract" # depends on broken package limma + "SimBindProfiles" # depends on broken package limma + "ccTutorial" # depends on broken package limma + "Ringo" # depends on broken package limma + "rCGH" # depends on broken package limma + "qusage" # depends on broken package limma + "qpcrNorm" # depends on broken package limma + "prot2D" # depends on broken package limma + "polyester" # depends on broken package limma + "plmDE" # depends on broken package limma + "phenoTest" # depends on broken package limma + "RANKS" # depends on broken package limma + "PerfMeas" # depends on broken package limma + "pepStat" # depends on broken package limma + "PECA" # depends on broken package limma + "PADOG" # depends on broken package limma + "OGSA" # depends on broken package limma + "nethet" # depends on broken package limma + "lpNet" # depends on broken package limma + "nem" # depends on broken package limma + "monocle" # depends on broken package limma + "MmPalateMiRNA" # depends on broken package limma + "miRtest" # depends on broken package limma + "miRLAB" # depends on broken package limma + "mGSZ" # depends on broken package limma + "MAMA" # depends on broken package limma + "metaMA" # depends on broken package limma + "msd16s" # depends on broken package limma + "metagenomeSeq" # depends on broken package limma + "metabolomics" # depends on broken package limma + "maSigPro" # depends on broken package limma + "timecourse" # depends on broken package limma + "stepNorm" # depends on broken package limma + "RBM" # depends on broken package limma + "saps" # depends on broken package limma + "PharmacoGx" # depends on broken package limma + "piano" # depends on broken package limma + "OLINgui" # depends on broken package limma + "OLIN" # depends on broken package limma + "nnNorm" # depends on broken package limma + "ListerEtAlBSseq" # depends on broken package limma + "compEpiTools" # depends on broken package limma + "methylPipe" # depends on broken package limma + "dyebiasexamples" # depends on broken package limma + "dyebias" # depends on broken package limma + "CluMix" # depends on broken package limma + "HCsnip" # depends on broken package limma + "sigaR" # depends on broken package limma + "plrs" # depends on broken package limma + "CGHregions" # depends on broken package limma + "QDNAseq_mm10" # depends on broken package limma + "QDNAseq_hg19" # depends on broken package limma + "QDNAseq" # depends on broken package limma + "GeneBreak" # depends on broken package limma + "focalCall" # depends on broken package limma + "CGHnormaliter" # depends on broken package limma + "CGHcall" # depends on broken package limma + "CGHbase" # depends on broken package limma + "beta7" # depends on broken package limma + "marray" # depends on broken package limma + "LVSmiRNA" # depends on broken package limma + "lmdme" # depends on broken package limma + "limmaGUI" # depends on broken package limma + "InPAS" # depends on broken package limma + "iChip" # depends on broken package limma + "unifiedWMWqPCR" # depends on broken package limma + "nondetects" # depends on broken package limma + "HTqPCR" # depends on broken package limma + "HD2013SGI" # depends on broken package limma + "vtpnet" # depends on broken package limma + "gwascat" # depends on broken package limma + "gQTLstats" # depends on broken package limma + "GOsummaries" # depends on broken package limma + "yri1kgv" # depends on broken package limma + "hmyriB36" # depends on broken package limma + "cheung2010" # depends on broken package limma + "GGtools" # depends on broken package limma + "GGdata" # depends on broken package limma + "encoDnaseI" # depends on broken package limma + "dsQTL" # depends on broken package limma + "ceuhm3" # depends on broken package limma + "ceu1kgv" # depends on broken package limma + "ceu1kg" # depends on broken package limma + "GGBase" # depends on broken package limma + "GeneSelector" # depends on broken package limma + "GeneSelectMMD" # depends on broken package limma + "gCMAPWeb" # depends on broken package limma + "gCMAP" # depends on broken package limma + "flowBin" # depends on broken package limma + "Fletcher2013a" # depends on broken package limma + "FEM" # depends on broken package limma + "explorase" # depends on broken package limma + "ExiMiR" # depends on broken package limma + "tweeDEseq" # depends on broken package limma + "tRanslatome" # depends on broken package limma + "ToPASeq" # depends on broken package limma + "timeSeq" # depends on broken package limma + "TCGAbiolinks" # depends on broken package limma + "TCC" # depends on broken package limma + "systemPipeR" # depends on broken package limma + "STATegRa" # depends on broken package limma + "ssizeRNA" # depends on broken package limma + "RUVSeq" # depends on broken package limma + "RnaSeqSampleSizeData" # depends on broken package limma + "RnaSeqSampleSize" # depends on broken package limma + "rnaSeqMap" # depends on broken package limma + "ReportingTools" # depends on broken package limma + "QuasiSeq" # depends on broken package limma + "PROPER" # depends on broken package limma + "myTAI" # depends on broken package limma + "msmsTests" # depends on broken package limma + "methylMnM" # depends on broken package limma + "metaseqR" # depends on broken package limma + "MEDIPS" # depends on broken package limma + "manta" # depends on broken package limma + "HTSFilter" # depends on broken package limma + "HTSCluster" # depends on broken package limma + "GSAgm" # depends on broken package limma + "fdrDiscreteNull" # depends on broken package limma + "erccdashboard" # depends on broken package limma + "EnrichmentBrowser" # depends on broken package limma + "edgeRun" # depends on broken package limma + "EDDA" # depends on broken package limma + "RnaSeqTutorial" # depends on broken package limma + "easyRNASeq" # depends on broken package limma + "DEGreport" # depends on broken package limma + "Imetagene" # depends on broken package limma + "metagene" # depends on broken package limma + "DBChIP" # depends on broken package limma + "babel" # depends on broken package limma + "apmsWAPP" # depends on broken package limma + "ampliQueso" # depends on broken package limma + "edgeR" # depends on broken package limma + "MMDiff" # depends on broken package limma + "ChIPQC" # depends on broken package limma + "DiffBind" # depends on broken package limma + "DCGL" # depends on broken package limma + "Prostar" # depends on broken package limma + "DAPAR" # depends on broken package limma + "DAAGbio" # depends on broken package limma + "csaw" # depends on broken package limma + "cp4p" # depends on broken package limma + "coRNAi" # depends on broken package limma + "Cormotif" # depends on broken package limma + "CORM" # depends on broken package limma + "TurboNorm" # depends on broken package limma + "maigesPack" # depends on broken package limma + "convert" # depends on broken package limma + "compcodeR" # depends on broken package limma + "codelink" # depends on broken package limma + "clippda" # depends on broken package limma + "REDseq" # depends on broken package limma + "GUIDEseq" # depends on broken package limma + "ggtut" # depends on broken package limma + "FunciSNP" # depends on broken package limma + "ChIPpeakAnno" # depends on broken package limma + "ChIPComp" # depends on broken package limma + "ChimpHumanBrainData" # depends on broken package limma + "charmData" # depends on broken package limma + "charm" # depends on broken package limma + "cghMCR" # depends on broken package limma + "CCl4" # depends on broken package limma + "casper" # depends on broken package limma + "CancerMutationAnalysis" # depends on broken package limma + "CALIB" # depends on broken package limma + "quantro" # depends on broken package limma + "RnBeads" # depends on broken package limma + "mvoutData" # depends on broken package limma + "MineICA" # depends on broken package limma + "methyAnalysis" # depends on broken package limma + "MAQCsubsetILM" # depends on broken package limma + "MAQCsubset" # depends on broken package limma + "lumiRatIDMapping" # depends on broken package limma + "lumiMouseIDMapping" # depends on broken package limma + "lumiHumanIDMapping" # depends on broken package limma + "lumiBarnes" # depends on broken package limma + "iCheck" # depends on broken package limma + "ffpeExampleData" # depends on broken package limma + "arrayMvout" # depends on broken package limma + "lumi" # depends on broken package limma + "ffpe" # depends on broken package limma + "methylumi" # depends on broken package limma + "shinyMethyl" # depends on broken package limma + "MethylAidData" # depends on broken package limma + "MethylAid" # depends on broken package limma + "IlluminaHumanMethylation450kmanifest" # depends on broken package limma + "skewr" # depends on broken package limma + "wateRmelon" # depends on broken package limma + "missMethyl" # depends on broken package limma + "minfiData" # depends on broken package limma + "IlluminaHumanMethylation450kanno_ilmn12_hg19" # depends on broken package limma + "IlluminaHumanMethylation27kmanifest" # depends on broken package limma + "FlowSorted_DLPFC_450k" # depends on broken package limma + "FlowSorted_Blood_450k" # depends on broken package limma + "ENmix" # depends on broken package limma + "ELMER" # depends on broken package limma + "MEAL" # depends on broken package limma + "DMRcate" # depends on broken package limma + "CopyNumber450kData" # depends on broken package limma + "CopyNumber450k" # depends on broken package limma + "conumee" # depends on broken package limma + "ChAMP" # depends on broken package limma + "minfi" # depends on broken package limma + "regionReport" # depends on broken package limma + "derfinderPlot" # depends on broken package limma + "derfinder" # depends on broken package limma + "bumphunter" # depends on broken package limma + "birta" # depends on broken package limma + "betr" # depends on broken package limma + "beadarrayMSV" # depends on broken package limma + "RobLoxBioC" # depends on broken package limma + "maGUI" # depends on broken package limma + "epigenomix" # depends on broken package limma + "blima" # depends on broken package limma + "BeadArrayUseCases" # depends on broken package limma + "beadarrayFilter" # depends on broken package limma + "beadarrayExampleData" # depends on broken package limma + "beadarray" # depends on broken package limma + "ballgown" # depends on broken package limma + "attract" # depends on broken package limma + "ArrayTools" # depends on broken package limma + "arrayQuality" # depends on broken package limma + "DrugVsDisease" # depends on broken package limma + "ArrayExpress" # depends on broken package limma + "oneChannelGUI" # depends on broken package limma + "affylmGUI" # depends on broken package limma + "AffyExpress" # depends on broken package limma + "AgiMicroRna" # depends on broken package limma + "affycoretools" # depends on broken package limma + "ABSSeq" # depends on broken package limma + "a4" # depends on broken package limma + "a4Base" # depends on broken package limma + "limma" # broken build + "TransView" # broken build + "Starr" # broken build + "SICtools" # broken build + "ReQON" # depends on broken package seqbias + "seqbias" # broken build + "Repitools" # broken build + "QuasR" # broken build + "qrqc" # broken build + "ProteomicsAnnotationHubData" # broken build + "podkat" # broken build + "PING" # depends on broken package PICS + "PICS" # broken build + "mcaGUI" # broken build + "deepSNV" # broken build + "motifbreakR" # depends on broken package MotIV + "LowMACA" # depends on broken package MotIV + "dagLogo" # depends on broken package MotIV + "motifStack" # depends on broken package MotIV + "MotIV" # broken build + "CNEr" # broken build + "canceR" # broken build + "BubbleTree" # broken build + "arrayQualityMetrics" # broken build + "ArrayExpressHTS" # broken build + "TargetSearchData" # depends on broken package TargetSearch + "TargetSearch" # broken build + "ptw" # depends on broken package nloptr + "gpuR" # broken build + "erma" # broken build + "MBmca" # depends on broken package chipPCR + "dpcR" # depends on broken package chipPCR + "chipPCR" # broken build + "alsace" # broken build + "rrlda" # depends on broken package VIM + "qrfactor" # depends on broken package VIM + "MVN" # depends on broken package VIM + "mvoutlier" # depends on broken package VIM + "robCompositions" # depends on broken package VIM + "DiagrammeRsvg" # depends on broken package V8 + "dagitty" # depends on broken package V8 + "remoter" # depends on broken package sodium + "Fletcher2013b" # depends on broken package RTN + "apaStyle" # depends on broken package ReporteRs + "categoryCompare" # depends on broken package RCytoscape + "preseqR" # depends on broken package polynom + "permutations" # depends on broken package partitions + "GLMMRR" # depends on broken package lme4 + "replicationInterval" # depends on broken package lme4 + "GWASdata" # depends on broken package GWASTools + "EnsemblePCReg" # depends on broken package EnsembleBase + "EnsembleCV" # depends on broken package EnsembleBase + "cpgen" # depends on broken package pedigreemm + "mitml" # depends on broken package jomo + "IlluminaHumanMethylation450k_db" # broken build + "gahgu95ecdf" # broken build + "gahgu95dcdf" # broken build + "gahgu95ccdf" # broken build + "gahgu95bcdf" # broken build + "gahgu95av2cdf" # broken build + "PREDAsampledata" # depends on broken package gahgu133plus2cdf + "gahgu133plus2cdf" # broken build + "gahgu133bcdf" # broken build + "gahgu133acdf" # broken build + "annmap" # depends on broken package RMySQL + "choroplethr" # depends on broken package acs + "acs" # broken build + "spray" # depends on broken package partitions + "simmr" # depends on broken package rjags + "morse" # depends on broken package rjags + "gemtc" # depends on broken package rjags + "EasyMARK" # depends on broken package rjags + "PVAClone" # depends on broken package rjags + "sharx" # depends on broken package rjags + "dcmle" # depends on broken package rjags + "dclone" # depends on broken package rjags + "CNVrd2" # depends on broken package rjags + "bayescount" # depends on broken package rjags + "BANOVA" # depends on broken package rjags + "rjags" # broken build + "proteoQC" # depends on broken package rTANDEM + "PGA" # depends on broken package rTANDEM + "MBESS" # depends on broken package OpenMx + "IONiseR" # depends on broken package rhdf5 + "DOQTL" # depends on broken package rhdf5 + "DmelSGI" # depends on broken package rhdf5 + "flowDiv" # depends on broken package ncdfFlow + "ChemmineDrugs" # depends on broken package ChemmineR + "stpm" # depends on broken package nloptr + "sjmisc" # depends on broken package nloptr + "rstanarm" # depends on broken package nloptr + "glmmsr" # depends on broken package nloptr + "FDboost" # depends on broken package nloptr + "faraway" # depends on broken package nloptr + "interplot" # depends on broken package nloptr + "VSE" # depends on broken package car + "VARSEDIG" # depends on broken package car + "translateSPSS2R" # depends on broken package car + "tadaatoolbox" # depends on broken package car + "lavaan_shiny" # depends on broken package car + "RcmdrPlugin_GWRM" # depends on broken package car + "TextoMineR" # depends on broken package car + "pcaBootPlot" # depends on broken package car + "ClustGeo" # depends on broken package car + "preproviz" # depends on broken package car + "hsdar" # depends on broken package car + "DecisionCurve" # depends on broken package car + "CONDOP" # depends on broken package car + "EnsemblePenReg" # depends on broken package car + "EnsembleBase" # depends on broken package car + "fullfact" # depends on broken package car + "clusterSEs" # depends on broken package car + "ggiraph" # depends on broken package gdtools + "rvg" # depends on broken package gdtools + "ggpmisc" # depends on broken package polynom + "mlt_docreg" # depends on broken package polynom + "mlt" # depends on broken package polynom + "basefun" # depends on broken package polynom + "rtable" # depends on broken package ReporteRs + "Mediana" # depends on broken package ReporteRs + "ReporteRs" # broken build + "abd" # depends on broken package nlopt + "adabag" # depends on broken package nlopt + "adhoc" # broken build + "AER" # depends on broken package nlopt + "afex" # depends on broken package nlopt + "agRee" # depends on broken package nlopt + "aLFQ" # depends on broken package nlopt + "algstat" # broken build + "alr3" # depends on broken package nlopt + "alr4" # depends on broken package nlopt + "alsace" # depends on broken nloptr + "anacor" # depends on broken package nlopt + "aods3" # depends on broken package nlopt + "apaTables" # depends on broken package car + "apt" # depends on broken package nlopt + "ArfimaMLM" # depends on broken package nlopt + "arm" # depends on broken package nlopt + "ART" # depends on broken package car + "ARTool" # depends on broken package nlopt "AssetPricing" # broken build "AtelieR" # broken build - "attract" # depends on broken package AnnotationForge-1.11.3 - "auRoc" # depends on broken package rjags-4-4 - "AutoModel" # depends on broken package r-car-2.1-0 - "babel" # broken build - "BACA" # depends on broken package Category-2.35.1 - "backShift" # broken build - "BAGS" # build is broken - "ballgown" # depends on broken package Rsamtools-1.21.8 - "bamdit" - "bamsignals" # build is broken - "BANOVA" - "bapred" # depends on broken package r-lme4-1.1-9 - "bartMachine" # depends on broken package nlopt-2.4.2 - "Basic4Cseq" # depends on broken package Rsamtools-1.21.8 - "bayescount" - "bayesDem" # depends on broken package nlopt-2.4.2 - "bayesLife" # depends on broken package nlopt-2.4.2 - "BayesMed" - "bayesmix" - "BayesPeak" # broken build - "bayesPop" # depends on broken package nlopt-2.4.2 - "Bayesthresh" # depends on broken package nlopt-2.4.2 - "bayou" # broken build - "baySeq" # broken build - "BaySIC" - "BBCAnalyzer" # depends on broken package r-Rsamtools-1.21.18 - "BBRecapture" # depends on broken package nlopt-2.4.2 - "BCA" # depends on broken package nlopt-2.4.2 - "BcDiag" # broken build - "BCRANK" # broken build - "bcrypt" - "bdynsys" # depends on broken package car-2.1 - "beadarray" # broken build - "beadarrayFilter" # broken build - "beadarrayMSV" # broken build - "beadarraySNP" # broken build - "BEAT" # depends on broken package Rsamtools-1.21.8 - "BEDMatrix" # broken build - "bedr" # broken build - "BEST" - "betr" # broken build - "bgmm" # depends on broken package nlopt-2.4.2 - "bgx" # depends on broken package affyio-1.37.0 - "BicARE" # broken build - "BIFIEsurvey" # depends on broken package nlopt-2.4.2 - "bigGP" # build is broken - "BiGGR" # depends on broken package rsbml-2.27.0 - "bigmemoryExtras" # broken build + "auRoc" # depends on broken package rjags + "AutoModel" # depends on broken package car + "bamdit" # broken build + "BANOVA" # broken build + "bapred" # depends on broken package lme4 + "bartMachine" # depends on broken package nlopt + "bayescount" # broken build + "bayesDem" # depends on broken package nlopt + "bayesLife" # depends on broken package nlopt + "BayesMed" # broken build + "bayesmix" # broken build + "bayesPop" # depends on broken package nlopt + "Bayesthresh" # depends on broken package nlopt + "BaySIC" # broken build + "BBRecapture" # depends on broken package nlopt + "BCA" # depends on broken package nlopt + "bdynsys" # depends on broken package car + "BEST" # broken build + "bgmm" # depends on broken package nlopt + "BIFIEsurvey" # depends on broken package nlopt + "BiGGR" # depends on broken package rsbml "bioassayR" # broken build - "Biobase" # broken build - "biobroom" # depends on broken package r-Biobase-2.30.0 - "BiocCaseStudies" # broken build - "BiocCheck" # broken build - "BiocGenerics" # broken build - "biocGraph" # broken build - "biocViews" # broken build - "bioDist" # broken build - "BiodiversityR" # depends on broken package nlopt-2.4.2 - "biomaRt" # broken build - "biomartr" # broken build - "BioMVCClass" # broken build - "biomvRCNS" # depends on broken package Rsamtools-1.21.8 - "BioNet" # broken build - "BioSeqClass" # broken build - "Biostrings" # broken build - "biosvd" # broken build - "biotools" # depends on broken package rpanel-1.1-3 - "biovizBase" # depends on broken package Rsamtools-1.21.8 - "birta" # broken build + "BiodiversityR" # depends on broken package nlopt + "biotools" # depends on broken package rpanel "birte" # build is broken - "bisectr" # broken build - "BiSEp" # depends on broken package GOSemSim-1.27.3 - "BiSeq" # depends on broken package Rsamtools-1.21.8 - "BitSeq" # depends on broken package Rsamtools-1.21.8 - "BLCOP" # depends on broken package Rsymphony-0.1-20 - "blima" # broken build - "blmeco" # depends on broken package nlopt-2.4.2 - "blme" # depends on broken package nlopt-2.4.2 - "bmd" # depends on broken package nlopt-2.4.2 - "bmem" # depends on broken package nlopt-2.4.2 - "bmeta" # depends on broken package r-R2jags-0.5-7 - "BMhyd" # broken build - "bnclassify" # broken build - "bootnet" # depends on broken package nlopt-2.4.2 - "boral" - "boss" # depends on broken package nlopt-2.4.2 - "BradleyTerry2" # depends on broken package nlopt-2.4.2 + "BLCOP" # depends on broken package Rsymphony + "blmeco" # depends on broken package nlopt + "blme" # depends on broken package nlopt + "bmd" # depends on broken package nlopt + "bmem" # depends on broken package nlopt + "bmeta" # depends on broken package R2jags + "bootnet" # depends on broken package nlopt + "boral" # broken build + "BradleyTerry2" # depends on broken package nlopt "BrailleR" # broken build - "BRAIN" # broken build "brainGraph" # build is broken - "BrainStars" # broken build "brms" # build is broken - "BrowserViz" # broken build - "BrowserVizDemo" # broken build - "brr" # broken build "BRugs" # build is broken - "BSgenome" # depends on broken package Rsamtools-1.21.8 - "bsseq" # broken build - "BTSPAS" - "BubbleTree" # depends on broken package r-biovizBase-1.17.2 - "bumphunter" # depends on broken package Rsamtools-1.21.8 - "CADFtest" # depends on broken package nlopt-2.4.2 - "CAFE" # depends on broken package affyio-1.37.0 - "CAGEr" # depends on broken package Rsamtools-1.21.8 - "cAIC4" # depends on broken package nlopt-2.4.2 - "CAMERA" # depends on broken package mzR-2.3.1 - "cancerclass" # broken build - "canceR" # depends on broken package Category-2.35.1 - "CancerMutationAnalysis" # broken build - "candisc" # depends on broken package nlopt-2.4.2 - "carcass" # depends on broken package nlopt-2.4.2 - "car" # depends on broken package nlopt-2.4.2 - "Cardinal" # broken build - "caret" # depends on broken package nlopt-2.4.2 - "caretEnsemble" # depends on broken package nlopt-2.4.2 - "caRpools" # broken build - "CARrampsOcl" # depends on broken package OpenCL-0.1-3 - "casper" # depends on broken package Rsamtools-1.21.8 - "cate" # broken build - "Category" # Build Is Broken - "categoryCompare" # depends on broken package Category-2.35.1 + "BTSPAS" # broken build + "CADFtest" # depends on broken package nlopt + "cAIC4" # depends on broken package nlopt + "candisc" # depends on broken package nlopt + "carcass" # depends on broken package nlopt + "car" # depends on broken package nlopt + "caret" # depends on broken package nlopt + "caretEnsemble" # depends on broken package nlopt + "CARrampsOcl" # depends on broken package OpenCL "Causata" # broken build - "CCpop" # depends on broken package nlopt-2.4.2 - "CCTpack" - "cdcfluview" # broken build - "cellHTS2" # depends on broken package Category-2.35.1 - "cellHTS" # broken build - "CellNOptR" # broken build - "CexoR" # depends on broken package Rsamtools-1.21.8 - "CGHbase" # broken build - "CGHcall" # broken build - "cghMCR" # broken build - "CGHnormaliter" # broken build - "CGHregions" # broken build - "ChainLadder" # depends on broken package nlopt-2.4.2 - "ChAMP" # depends on broken package affyio-1.37.0 - "charm" # depends on broken package affyio-1.37.0 - "ChemmineOB" # broken build + "CCpop" # depends on broken package nlopt + "CCTpack" # broken build + "ChainLadder" # depends on broken package nlopt "ChemmineR" # Build Is Broken - "chimera" # depends on broken package Rsamtools-1.21.8 - "ChIPComp" # depends on broken package r-Rsamtools-1.21.18 "chipenrich" # build is broken - "chipPCR" # depends on broken nloptr-1.0.4 - "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8 - "ChIPQC" # depends on broken package AnnotationForge-1.11.3 - "ChIPseeker" # depends on broken package Rsamtools-1.21.8 - "chipseq" # depends on broken package Rsamtools-1.21.8 - "ChIPseqR" # depends on broken package Rsamtools-1.21.8 - "ChIPsim" # depends on broken package Rsamtools-1.21.8 - "ChIPXpress" # depends on broken package affyio-1.37.0 - "chroGPS" # broken build - "chromDraw" # broken build - "ChromHeatMap" # depends on broken package Rsamtools-1.21.8 - "classGraph" # broken build - "classify" - "ClassifyR" # broken build - "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8 - "cleaver" # broken build - "clere" # broken build - "climwin" # depends on broken package nlopt-2.4.2 - "clippda" # broken build - "clipper" # depends on broken package Rsamtools-1.21.8 - "CLME" # depends on broken package nlopt-2.4.2 + "chipPCR" # depends on broken nloptr + "classify" # broken build + "climwin" # depends on broken package nlopt + "CLME" # depends on broken package nlopt "clpAPI" # build is broken - "clusterPower" # depends on broken package nlopt-2.4.2 - "clusterProfiler" # depends on broken package GOSemSim-1.27.3 - "clusterSEs" # depends on broken AER-1.2-4 - "clusterStab" # broken build - "ClustGeo" # depends on broken FactoMineR-1.31.3 - "CMA" # broken build - "CNEr" # depends on broken package Rsamtools-1.21.8 - "cn_farms" # depends on broken package affyio-1.37.0 - "cn_mops" # depends on broken package Rsamtools-1.21.8 - "CNORdt" # broken build - "CNORfeeder" # broken build - "CNORfuzzy" # depends on broken package nlopt-2.4.2 - "CNORode" # broken build - "CNPBayes" # depends on broken package r-BiocGenerics-0.16.1 - "CNTools" # broken build - "cnvGSA" # broken build - "CNVPanelizer" # depends on broken cn.mops-1.15.1 - "CNVrd2" # depends on broken package Rsamtools-1.21.8 - "coalescentMCMC" # depends on broken package Biostrings-2.38.2 - "cobindR" # depends on broken package Rsamtools-1.21.8 - "CoCiteStats" # Build Is Broken - "codelink" # broken build - "CODEX" # depends on broken package Rsamtools-1.21.8 - "coefplot" # build is broken - "cogena" # broken build + "clusterPower" # depends on broken package nlopt + "clusterSEs" # depends on broken AER + "ClustGeo" # depends on broken FactoMineR + "CNORfuzzy" # depends on broken package nlopt + "CNVPanelizer" # depends on broken cn.mops "COHCAP" # build is broken - "colorscience" - "coMET" # depends on broken package Rsamtools-1.21.8 - "CommT" # depends on broken package Biostrings-2.38.2 - "compcodeR" # broken build + "colorscience" # broken build "compendiumdb" # broken build - "compEpiTools" # depends on broken package topGO-2.21.0 - "CompGO" # depends on broken package Category-2.35.1 - "conformal" # depends on broken package nlopt-2.4.2 - "ConsensusClusterPlus" # Build Is Broken - "conumee" # depends on broken package Rsamtools-1.21.8 - "convert" # broken build - "convevol" # broken build - "copa" # broken build - "CopulaDTA" # depends on broken package r-rstan-2.8.2 - "CopyNumber450k" # depends on broken package Rsamtools-1.21.8 - "copynumber" # broken build - "CopywriteR" # depends on broken package Rsamtools-1.21.8 - "corHMM" # depends on broken package nlopt-2.4.2 - "Cormotif" # depends on broken package affyio-1.37.0 - "coRNAi" # depends on broken package Category-2.35.1 - "cosmiq" # depends on broken package mzR-2.3.1 - "CosmoPhotoz" # depends on broken package nlopt-2.4.2 - "CoverageView" # depends on broken package Rsamtools-1.21.8 - "covmat" # depends on broken package r-VIM-4.4.1 - "covr" # broken build - "cp4p" # broken build - "cpgen" # depends on broken package r-pedigreemm-0.3-3 + "conformal" # depends on broken package nlopt + "corHMM" # depends on broken package nlopt + "CosmoPhotoz" # depends on broken package nlopt + "covmat" # depends on broken package VIM "cplexAPI" # build is broken - "cpvSNP" # depends on broken package Rsamtools-1.21.8 - "cquad" # depends on broken package car-2.1-1 - "creditr" # broken build - "CRImage" # broken build - "CRISPRseek" # depends on broken package Rsamtools-1.21.8 - "crlmm" # depends on broken package affyio-1.37.0 - "crmn" # broken build - "crmPack" # depends on broken package r-rjags-4-4 - "Crossover" # Build Is Broken - "CrypticIBDcheck" # depends on broken package nlopt-2.4.2 - "CSAR" # broken build - "csaw" # depends on broken package Rsamtools-1.21.8 - "ctsem" # depends on broken package r-OpenMx-2.2.6 + "cquad" # depends on broken package car + "crmPack" # depends on broken package rjags + "CrypticIBDcheck" # depends on broken package nlopt + "ctsem" # depends on broken package OpenMx "cudaBayesreg" # build is broken - "cummeRbund" # depends on broken package Rsamtools-1.21.8 - "curvHDR" # broken build - "customProDB" # depends on broken package Rsamtools-1.21.8 - "cycle" # broken build - "cytofkit" # broken build - "D2C" # broken build - "daff" # depends on broken package V8-0.6 + "daff" # depends on broken package V8 "dagbag" # build is broken - "dagLogo" # depends on broken package Rsamtools-1.21.8 - "DAMisc" # depends on broken package nlopt-2.4.2 - "DAPAR" # depends on broken package r-imputeLCMD-2.0 - "DASiR" # broken build - "datafsm" # depends on broken package r-caret-6.0-52 - "DBChIP" # broken build + "DAMisc" # depends on broken package nlopt + "datafsm" # depends on broken package caret "dbConnect" # broken build - "DBKGrad" # depends on broken package rpanel-1.1-3 - "dcGOR" # broken build - "DChIPRep" # depends on broken package r-DESeq2-1.10.0 - "dcmle" - "ddCt" # broken build - "DDD" # depends on broken package r-phytools-0.5-00 - "ddgraph" # broken build + "DBKGrad" # depends on broken package rpanel + "dcmle" # broken build "ddst" # broken build - "DECIPHER" # broken build - "DeconRNASeq" # broken build - "Deducer" # depends on broken package nlopt-2.4.2 - "DeducerExtras" # depends on broken package nlopt-2.4.2 - "DeducerPlugInExample" # depends on broken package nlopt-2.4.2 - "DeducerPlugInScaling" # depends on broken package nlopt-2.4.2 - "DeducerSpatial" # depends on broken package nlopt-2.4.2 - "DeducerSurvival" # depends on broken package nlopt-2.4.2 - "DeducerText" # depends on broken package nlopt-2.4.2 - "deepSNV" # depends on broken package Rsamtools-1.21.8 - "DEGraph" # depends on broken package RCytoscape-1.19.0 - "DEGreport" # broken build - "demi" # depends on broken package affyio-1.37.0 - "derfinder" # depends on broken package Rsamtools-1.21.8 - "derfinderHelper" # broken build - "derfinderPlot" # depends on broken package Rsamtools-1.21.8 - "DescribeDisplay" # build is broken - "DESeq2" # broken build - "DESeq" # broken build - "DESP" # broken build - "destiny" # depends on broken package VIM-4.3.0 - "DEXSeq" # depends on broken package Rsamtools-1.21.8 - "dexus" # broken build - "DFP" # broken build - "DiagTest3Grp" # depends on broken package nlopt-2.4.2 - "DiffBind" # depends on broken package AnnotationForge-1.11.3 - "DiffCorr" # broken build - "diffHic" # depends on broken package rhdf5-2.13.1 - "difR" # depends on broken package nlopt-2.4.2 - "diggit" # broken build + "Deducer" # depends on broken package nlopt + "DeducerExtras" # depends on broken package nlopt + "DeducerPlugInExample" # depends on broken package nlopt + "DeducerPlugInScaling" # depends on broken package nlopt + "DeducerSpatial" # depends on broken package nlopt + "DeducerSurvival" # depends on broken package nlopt + "DeducerText" # depends on broken package nlopt + "DEGraph" # depends on broken package RCytoscape + "destiny" # depends on broken package VIM + "DiagTest3Grp" # depends on broken package nlopt + "diffHic" # depends on broken package rhdf5 + "difR" # depends on broken package nlopt "DirichletMultinomial" # Build Is Broken - "discSurv" # depends on broken package nlopt-2.4.2 - "DistatisR" # depends on broken package nlopt-2.4.2 - "diveRsity" # depends on broken package nlopt-2.4.2 - "DJL" # depends on broken package r-car-2.1-0 - "DMRcaller" # broken build - "DMRcate" # depends on broken package Rsamtools-1.21.8 - "DMRforPairs" # depends on broken package Rsamtools-1.21.8 - "dnet" # broken build - "docxtractr" # broken build - "domainsignatures" # build is broken - "doMPI" # build is broken - "DOQTL" # depends on broken package Rsamtools-1.21.8 - "DOSE" # depends on broken package GOSemSim-1.27.3 - "dpa" # depends on broken package nlopt-2.4.2 - "dpcR" # depends on broken nloptr-1.0.4 - "drc" # depends on broken package nlopt-2.4.2 - "drfit" # depends on broken package nlopt-2.4.2 - "drsmooth" # depends on broken package nlopt-2.4.2 - "DrugVsDisease" # depends on broken package affyio-1.37.0 - "DSS" # broken build - "dualKS" # depends on broken package affyio-1.37.0 - "dupRadar" # depends on broken package r-Rsubread-1.19.5 - "dyebias" # broken build - "dynlm" # depends on broken package nlopt-2.4.2 - "easyanova" # depends on broken package nlopt-2.4.2 - "EasyMARK" - "easyRNASeq" # depends on broken package Rsamtools-1.21.8 - "EBarrays" # broken build - "EBcoexpress" # broken build - "EBImage" # broken build - "ecd" # depends on broken package r-polynom-1.3-8 - "ecolitk" # broken build - "EDASeq" # depends on broken package Rsamtools-1.21.8 - "EDDA" # broken build - "edge" # depends on broken package nlopt-2.4.2 - "edgeR" # broken build - "edgeRun" # broken build - "edmr" # broken build - "eeptools" # depends on broken package nlopt-2.4.2 - "EffectLiteR" # depends on broken package nlopt-2.4.2 - "effects" # depends on broken package nlopt-2.4.2 - "eiR" # depends on broken package ChemmineR-2.21.7 - "eisa" # depends on broken package Category-2.35.1 - "ELMER" # depends on broken package Rsamtools-1.21.8 - "EMA" # depends on broken package nlopt-2.4.2 + "DistatisR" # depends on broken package nlopt + "diveRsity" # depends on broken package nlopt + "DJL" # depends on broken package car + "dpa" # depends on broken package nlopt + "dpcR" # depends on broken nloptr + "drc" # depends on broken package nlopt + "drfit" # depends on broken package nlopt + "drsmooth" # depends on broken package nlopt + "dynlm" # depends on broken package nlopt + "easyanova" # depends on broken package nlopt + "EasyMARK" # broken build + "ecd" # depends on broken package polynom + "edge" # depends on broken package nlopt + "eeptools" # depends on broken package nlopt + "EffectLiteR" # depends on broken package nlopt + "effects" # depends on broken package nlopt + "eiR" # depends on broken package ChemmineR + "EMA" # depends on broken package nlopt "embryogrowth" # broken build "emg" # broken build - "empiricalFDR_DESeq2" # broken build - "ENmix" # depends on broken package affyio-1.37.0 - "EnQuireR" # depends on broken package nlopt-2.4.2 - "EnrichedHeatmap" # broken build - "EnrichmentBrowser" # depends on broken package r-EDASeq-2.3.2 - "ensembldb" # depends on broken package interactiveDisplayBase-1.7.0 - "ensemblVEP" # depends on broken package Rsamtools-1.21.8 - "epigenomix" # depends on broken package Rsamtools-1.21.8 - "episplineDensity" # depends on broken package nlopt-2.4.2 - "epivizr" # depends on broken package Rsamtools-1.21.8 - "epoc" # broken build - "epr" # depends on broken package nlopt-2.4.2 - "erccdashboard" # broken build - "erer" # depends on broken package nlopt-2.4.2 - "erma" # depends on broken GenomicFiles-1.5.4 - "erpR" # depends on broken package rpanel-1.1-3 - "ESKNN" # depends on broken package r-caret-6.0-52 - "eulerian" # broken build + "EnQuireR" # depends on broken package nlopt + "episplineDensity" # depends on broken package nlopt + "epr" # depends on broken package nlopt + "erer" # depends on broken package nlopt + "erma" # depends on broken GenomicFiles + "erpR" # depends on broken package rpanel + "ESKNN" # depends on broken package caret "euroMix" # build is broken - "evobiR" # broken build - "evolqg" # broken build - "ExiMiR" # depends on broken package affyio-1.37.0 - "exomeCopy" # depends on broken package Rsamtools-1.21.8 - "ExomeDepth" # depends on broken package Rsamtools-1.21.8 - "exomePeak" # depends on broken package Rsamtools-1.21.8 - "ExpressionView" # depends on broken package Category-2.35.1 - "extRemes" # depends on broken package nlopt-2.4.2 - "ez" # depends on broken package nlopt-2.4.2 - "ezec" # depends on broken package drc-2.5 - "fabia" # broken build - "facopy" # depends on broken package nlopt-2.4.2 - "factDesign" # broken build - "FactoMineR" # depends on broken package nlopt-2.4.2 - "Factoshiny" # depends on broken package nlopt-2.4.2 - "faoutlier" # depends on broken package nlopt-2.4.2 - "farms" # depends on broken package affyio-1.37.0 - "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0 - "fastR" # depends on broken package nlopt-2.4.2 - "fastseg" # broken build - "fdrDiscreteNull" # broken build - "FDRreg" # depends on broken package nlopt-2.4.2 - "FedData" # broken build - "FEM" # build is broken - "ffpe" # depends on broken package affyio-1.37.0 - "FIACH" # broken build - "FindMyFriends" # broken build - "FISHalyseR" # broken build - "fishmethods" # depends on broken package r-lme4-1.1-10 - "flagme" # depends on broken package mzR-2.3.1 + "extRemes" # depends on broken package nlopt + "ez" # depends on broken package nlopt + "ezec" # depends on broken package drc + "facopy" # depends on broken package nlopt + "FactoMineR" # depends on broken package nlopt + "Factoshiny" # depends on broken package nlopt + "faoutlier" # depends on broken package nlopt + "fastR" # depends on broken package nlopt + "FDRreg" # depends on broken package nlopt + "fishmethods" # depends on broken package lme4 "flipflop" # broken build - "flowBeads" # broken build - "flowBin" # broken build - "flowcatchR" # broken build - "flowCHIC" # broken build - "flowCL" # broken build - "flowClean" # broken build - "flowClust" # broken build - "flowCore" # broken build - "flowDensity" # depends on broken package nlopt-2.4.2 - "flowDiv" # depends on broken package r-flowCore-1.35.11 - "flowFit" # broken build - "flowFP" # broken build - "flowMatch" # broken build - "flowMeans" # broken build - "flowMerge" # broken build + "flowDensity" # depends on broken package nlopt "flowPeaks" # build is broken - "flowQB" # broken build "flowQ" # build is broken - "FlowSOM" # depends on broken package ConsensusClusterPlus-1.23.0 - "flowStats" # depends on broken package ncdfFlow-2.15.2 - "flowTrans" # broken build - "flowType" # broken build - "flowUtils" # broken build - "flowViz" # broken build - "flowVS" # depends on broken package ncdfFlow-2.15.2 - "flowWorkspace" # depends on broken package ncdfFlow-2.15.2 - "fmcsR" # depends on broken package ChemmineR-2.21.7 - "focalCall" # broken build - "FourCSeq" # depends on broken package Rsamtools-1.21.8 - "fPortfolio" # depends on broken package Rsymphony-0.1-20 + "flowStats" # depends on broken package ncdfFlow + "flowVS" # depends on broken package ncdfFlow + "flowWorkspace" # depends on broken package ncdfFlow + "fmcsR" # depends on broken package ChemmineR + "fPortfolio" # depends on broken package Rsymphony "fracprolif" # broken build "FreeSortR" # broken build - "freqweights" # depends on broken package nlopt-2.4.2 - "frma" # depends on broken package affyio-1.37.0 - "frmaTools" # depends on broken package affyio-1.37.0 + "freqweights" # depends on broken package nlopt "frmqa" # broken build - "FSA" # depends on broken package car-2.1-1 - "fscaret" # depends on broken package nlopt-2.4.2 - "fulltext" # broken build - "FunciSNP" # depends on broken package snpStats-1.19.0 - "FunctionalNetworks" # Build Is Broken - "funcy" # depends on broken package r-car-2.1-0 - "fxregime" # depends on broken package nlopt-2.4.2 - "gaga" # broken build - "gage" # broken build - "gaggle" # broken build - "gamclass" # depends on broken package nlopt-2.4.2 - "gamlss_demo" # depends on broken package rpanel-1.1-3 - "gamm4" # depends on broken package nlopt-2.4.2 - "gaucho" # broken build + "FSA" # depends on broken package car + "fscaret" # depends on broken package nlopt + "funcy" # depends on broken package car + "fxregime" # depends on broken package nlopt + "gamclass" # depends on broken package nlopt + "gamlss_demo" # depends on broken package rpanel + "gamm4" # depends on broken package nlopt "gaussquad" # broken build - "gCMAP" # depends on broken package Category-2.35.1 - "gCMAPWeb" # depends on broken package Category-2.35.1 - "gcmr" # depends on broken package nlopt-2.4.2 - "gcrma" # depends on broken package affyio-1.37.0 - "GDAtools" # depends on broken package nlopt-2.4.2 + "gcmr" # depends on broken package nlopt + "GDAtools" # depends on broken package nlopt "gdtools" # broken build - "gemtc" - "GeneAnswers" # broken build - "GeneBreak" # depends on broken package r-CGHbase-1.30.0 - "GENE_E" # depends on broken package rhdf5-2.13.1 - "GeneExpressionSignature" # depends on broken package annaffy-1.41.1 - "genefilter" # broken build - "genefu" # broken build - "GeneMeta" # broken build - "GeneNetworkBuilder" # broken build - "geneplotter" # broken build - "geneRecommender" # broken build - "GeneRegionScan" # broken build - "geneRxCluster" # broken build - "GeneSelectMMD" # broken build - "GeneSelector" # broken build + "gemtc" # broken build + "GENE_E" # depends on broken package rhdf5 "GENESIS" # broken build - "geNetClassifier" # broken build - "GeneticTools" # depends on broken package snpStats-1.19.0 - "genomation" # depends on broken package Rsamtools-1.21.8 - "GenomeGraphs" # broken build - "GenomeInfoDb" # broken build - "genomeIntervals" # broken build - "genomes" # broken build - "GenomicAlignments" # depends on broken package Rsamtools-1.21.8 - "GenomicFeatures" # depends on broken package Rsamtools-1.21.8 - "GenomicFiles" # depends on broken package Rsamtools-1.21.8 - "GenomicInteractions" # depends on broken package Rsamtools-1.21.8 - "GenomicRanges" # broken build - "GenomicTuples" # broken build - "Genominator" # broken build - "genoset" # broken build - "genotypeeval" # depends on broken package r-rtracklayer-1.29.12 - "GenoView" # depends on broken package Rsamtools-1.21.8 - "genridge" # depends on broken package nlopt-2.4.2 - "geojsonio" # depends on broken package V8-0.6 - "GEOmetadb" # broken build - "geomorph" # broken build - "GEOquery" # broken build - "GEOsearch" # broken build - "GEOsubmission" # depends on broken package affyio-1.37.0 - "GERGM" - "gespeR" # depends on broken package Category-2.35.1 - "GEWIST" # depends on broken package nlopt-2.4.2 - "GExMap" # broken build - "gfcanalysis" # broken build - "GGBase" # depends on broken package snpStats-1.19.0 - "ggbio" # depends on broken package Rsamtools-1.21.8 - "ggsubplot" # build is broken - "ggtern" # build is broken - "GGtools" # depends on broken package snpStats-1.19.0 + "genridge" # depends on broken package nlopt + "geojsonio" # depends on broken package V8 + "GEWIST" # depends on broken package nlopt "ggtree" # broken build - "gimme" # depends on broken package nlopt-2.4.2 - "girafe" # depends on broken package Rsamtools-1.21.8 - "gitter" # broken build - "GlobalAncova" # broken build - "globaltest" # broken build - "gmapR" # depends on broken package Rsamtools-1.21.8 - "gmatrix" # depends on broken package cudatoolkit-5.5.22 + "gimme" # depends on broken package nlopt + "gmatrix" # depends on broken package cudatoolkit "gMCP" # build is broken "gmum_r" # broken build - "GOexpress" # broken build - "GOFunction" # build is broken - "GOGANPA" # depends on broken package WGCNA-1.47 - "GoogleGenomics" # depends on broken package Rsamtools-1.21.8 - "googlesheets" # broken build - "goProfiles" # build is broken - "GOSemSim" # Build Is Broken - "goseq" # build is broken - "GOSim" # depends on broken package topGO-2.21.0 - "Goslate" # depends on broken package r-PythonInR-0.1-2 - "GOstats" # depends on broken package AnnotationForge-1.11.3 - "GOTHiC" # depends on broken package Rsamtools-1.21.8 - "goTools" # build is broken + "Goslate" # depends on broken package PythonInR "GPC" # broken build - "gplm" # depends on broken package nlopt-2.4.2 + "gplm" # depends on broken package nlopt "gpuR" # depends on GPU-specific header files - "gputools" # depends on broken package cudatoolkit-5.5.22 - "gQTLBase" # depends on broken package r-GenomicFiles-1.5.8 - "gQTLstats" # depends on broken package snpStats-1.19.0 - "gRain" # broken build - "granova" # depends on broken package nlopt-2.4.2 - "GraphAT" # broken build - "graph" # broken build - "gRapHD" # broken build - "graphicalVAR" # depends on broken package nlopt-2.4.2 - "graphite" # broken build + "gputools" # depends on broken package cudatoolkit + "granova" # depends on broken package nlopt + "graphicalVAR" # depends on broken package nlopt "GraphPAC" # broken build - "GraphPCA" # depends on broken package nlopt-2.4.2 - "gRbase" # broken build - "gRc" # broken build - "GreyListChIP" # depends on broken package Rsamtools-1.21.8 - "gridDebug" # broken build "gridGraphics" # build is broken - "gridGraphviz" # broken build - "gRim" # broken build - "groHMM" # depends on broken package Rsamtools-1.21.8 - "GSAgm" # broken build - "GSCA" # depends on broken package rhdf5-2.13.1 - "GSEABase" # broken build - "GSEAlm" # broken build - "gsheet" # broken build - "GSRI" # broken build - "GSVA" # broken build - "GUIDE" # depends on broken package rpanel-1.1-3 - "GUIDEseq" # depends on broken package r-BiocGenerics-0.16.1 - "GUIProfiler" # broken build - "Guitar" # depends on broken package r-GenomicAlignments-1.5.18 - "Gviz" # depends on broken package Rsamtools-1.21.8 - "GWAF" # depends on broken package nlopt-2.4.2 - "gwascat" # depends on broken package interactiveDisplayBase-1.7.0 + "GSCA" # depends on broken package rhdf5 + "GUIDE" # depends on broken package rpanel + "GWAF" # depends on broken package nlopt "GWASTools" # broken build - "h2o" # build is broken "h5" # build is broken - "h5vc" # depends on broken package rhdf5-2.13.1 - "hapFabia" # broken build - "Harshlight" # depends on broken package affyio-1.37.0 - "hasseDiagram" # broken build - "hbsae" # depends on broken package nlopt-2.4.2 - "HCsnip" # broken build - "hddplot" # broken build - "HELP" # broken build - "HEM" # broken build - "heplots" # depends on broken package nlopt-2.4.2 - "hiAnnotator" # depends on broken package Rsamtools-1.21.8 - "HiCfeat" # depends on broken package r-GenomeInfoDb-1.5.16 + "h5vc" # depends on broken package rhdf5 + "hbsae" # depends on broken package nlopt + "heplots" # depends on broken package nlopt "HiDimMaxStable" # broken build - "hierGWAS" "HierO" # Build Is Broken - "highriskzone" - "HilbertCurve" # broken build "HilbertVisGUI" # Build Is Broken "HiPLARM" # Build Is Broken - "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8 - "hisse" # broken build - "HistDAWass" # depends on broken package nlopt-2.4.2 - "HiTC" # depends on broken package Rsamtools-1.21.8 - "HLMdiag" # depends on broken package nlopt-2.4.2 - "HMMcopy" # broken build + "HistDAWass" # depends on broken package nlopt + "HLMdiag" # depends on broken package nlopt "homomorpheR" # broken build - "hopach" # broken build "hpcwld" # broken build - "hpoPlot" # broken build - "HTqPCR" # depends on broken package affyio-1.37.0 - "HTSanalyzeR" # depends on broken package Category-2.35.1 - "HTSCluster" # broken build - "HTSeqGenie" # depends on broken package Rsamtools-1.21.8 - "htSeqTools" # depends on broken package Rsamtools-1.21.8 - "HTSFilter" # broken build "hwwntest" # broken build - "HybridMTest" # broken build "HydeNet" # broken build - "hyperdraw" # broken build - "hypergraph" # broken build - "hysteresis" # depends on broken package nlopt-2.4.2 - "IATscores" # depends on broken package nlopt-2.4.2 - "ibd" # depends on broken package nlopt-2.4.2 - "ibh" # build is broken - "iBMQ" # broken build - "iccbeta" # depends on broken package nlopt-2.4.2 - "iCheck" # depends on broken package r-affy-1.48.0 - "iClick" # depends on broken package rugarch-1.3-6 - "IdeoViz" # depends on broken package Rsamtools-1.21.8 - "idiogram" # broken build - "IdMappingAnalysis" # broken build - "IdMappingRetrieval" # broken build - "idm" # broken build - "ifaTools" # depends on broken package r-OpenMx-2.2.6 - "imageHTS" # depends on broken package Category-2.35.1 + "hysteresis" # depends on broken package nlopt + "IATscores" # depends on broken package nlopt + "ibd" # depends on broken package nlopt + "iccbeta" # depends on broken package nlopt + "iClick" # depends on broken package rugarch + "ifaTools" # depends on broken package OpenMx "imager" # broken build - "Imetagene" # depends on broken package r-metagene-2.2.0 - "immer" # depends on broken package r-sirt-1.8-9 "immunoClust" # build is broken - "imputeLCMD" # broken build - "imputeR" # depends on broken package nlopt-2.4.2 - "in2extRemes" # depends on broken package nlopt-2.4.2 - "inferference" # depends on broken package nlopt-2.4.2 - "influence_ME" # depends on broken package nlopt-2.4.2 - "InPAS" # depends on broken package Rsamtools-1.21.8 - "inSilicoDb" # broken build + "in2extRemes" # depends on broken package nlopt + "inferference" # depends on broken package nlopt + "influence_ME" # depends on broken package nlopt "inSilicoMerging" # build is broken - "INSPEcT" # depends on broken GenomicFeatures-1.21.13 - "intansv" # depends on broken package Rsamtools-1.21.8 - "IntegratedJM" # broken build - "interactiveDisplayBase" # build is broken - "interactiveDisplay" # depends on broken package Category-2.35.1 - "interplot" # depends on broken arm-1.8-5 - "ioncopy" # broken build - "ionflows" # broken build - "IONiseR" # depends on broken rhdf5-2.13.4 - "iPAC" # broken build - "iptools" - "IRanges" # broken build - "iRefR" # broken build - "IsingFit" # depends on broken package nlopt-2.4.2 - "isobar" # broken build - "IsoGene" # depends on broken package affyio-1.37.0 - "IsoGeneGUI" # depends on broken package affyio-1.37.0 - "ITALICS" # depends on broken package oligo-1.33.0 - "ITEMAN" # depends on broken package r-car-2.1-0 + "INSPEcT" # depends on broken GenomicFeatures + "interplot" # depends on broken arm + "IONiseR" # depends on broken rhdf5 + "IsingFit" # depends on broken package nlopt + "ITEMAN" # depends on broken package car "iteRates" # broken build - "iterativeBMA" # broken build "iterpc" # broken build - "IUPS" - "IVAS" # depends on broken package nlopt-2.4.2 - "ivpack" # depends on broken package nlopt-2.4.2 - "jagsUI" - "JAGUAR" # depends on broken package nlopt-2.4.2 - "jetset" - "jmosaics" # broken build - "joda" # depends on broken package nlopt-2.4.2 + "IUPS" # broken build + "IVAS" # depends on broken package nlopt + "ivpack" # depends on broken package nlopt + "jagsUI" # broken build + "JAGUAR" # depends on broken package nlopt + "joda" # depends on broken package nlopt "jomo" # build is broken - "js" # depends on broken package V8-0.6 - "KANT" # depends on broken package affyio-1.37.0 - "KCsmart" # broken build - "kebabs" # broken build - "KEGGgraph" # broken build - "keggorthology" # build is broken - "KEGGprofile" # Build Is Broken - "KEGGREST" # broken build + "js" # depends on broken package V8 "KoNLP" # broken build - "ktspair" # broken build - "kza" # broken build "kzft" # broken build - "LANDD" # depends on broken package r-GOSemSim-1.27.4 - "LaplaceDeconv" # depends on broken package r-orthopolynom-1.0-5 - "lapmix" # broken build - "lawn" # depends on broken package V8-0.6 + "LaplaceDeconv" # depends on broken package orthopolynom + "lawn" # depends on broken package V8 "ldamatch" # broken build - "ldblock" # depends on broken package r-snpStats-1.19.3 - "leapp" # broken build - "learnstats" # depends on broken package nlopt-2.4.2 - "LedPred" # broken build + "learnstats" # depends on broken package nlopt "lefse" # build is broken - "lessR" # depends on broken package nlopt-2.4.2 - "lfe" # build is broken - "lgcp" # depends on broken package rpanel-1.1-3 + "lessR" # depends on broken package nlopt + "lgcp" # depends on broken package rpanel "Libra" # broken build - "limmaGUI" # depends on broken package affyio-1.37.0 - "LinRegInteractive" # depends on broken package rpanel-1.1-3 - "LiquidAssociation" # build is broken - "lira" + "LinRegInteractive" # depends on broken package rpanel + "lira" # broken build "littler" # broken build - "lmdme" # build is broken - "lme4" # depends on broken package nlopt-2.4.2 - "LMERConvenienceFunctions" # depends on broken package nlopt-2.4.2 - "lmerTest" # depends on broken package nlopt-2.4.2 - "LMGene" # depends on broken package affyio-1.37.0 - "lmSupport" # depends on broken package nlopt-2.4.2 - "LogisticDx" # depends on broken package nlopt-2.4.2 - "LOGIT" # depends on broken package r-caret-6.0-58 - "logitT" # depends on broken package affyio-1.37.0 - "LOLA" # broken build - "longpower" # depends on broken package nlopt-2.4.2 - "LOST" # broken build - "LowMACA" # depends on broken package Rsamtools-1.21.8 - "lpNet" # broken build + "lme4" # depends on broken package nlopt + "LMERConvenienceFunctions" # depends on broken package nlopt + "lmerTest" # depends on broken package nlopt + "lmSupport" # depends on broken package nlopt + "LOGIT" # depends on broken package caret + "longpower" # depends on broken package nlopt "LPTime" # broken build - "lumi" # depends on broken package affyio-1.37.0 - "LVSmiRNA" # depends on broken package affyio-1.37.0 - "M3D" # depends on broken package Rsamtools-1.21.8 - "maanova" # broken build - "macat" # broken build - "maGUI" # depends on broken package r-affy-1.47.1 - "maigesPack" # broken build - "MAIT" # depends on broken package nlopt-2.4.2 - "makecdfenv" # depends on broken package affyio-1.37.0 - "MAMA" # broken build - "manta" # broken build + "MAIT" # depends on broken package nlopt "mAPKL" # build is broken - "maPredictDSC" # depends on broken package nlopt-2.4.2 + "maPredictDSC" # depends on broken package nlopt "mar1s" # broken build - "marked" # depends on broken package nlopt-2.4.2 - "markophylo" # depends on broken package r-Biostrings-2.38.2 - "maSigPro" # broken build - "maskBAD" # depends on broken package affyio-1.37.0 - "massiR" # broken build + "marked" # depends on broken package nlopt "matchingMarkets" # broken build - "MatrixRider" # depends on broken package DirichletMultinomial-1.11.1 - "MaxPro" # depends on broken package nlopt-2.4.2 - "MazamaSpatialUtils" # broken build - "MBASED" # broken build - "mbest" # depends on broken package nlopt-2.4.2 - "MBmca" # depends on broken nloptr-1.0.4 - "mBPCR" # depends on broken package affyio-1.37.0 + "MatrixRider" # depends on broken package DirichletMultinomial + "MaxPro" # depends on broken package nlopt + "mbest" # depends on broken package nlopt + "MBmca" # depends on broken nloptr "mBvs" # build is broken - "mcaGUI" # depends on broken package Rsamtools-1.21.8 - "MCRestimate" # build is broken - "mdgsa" # build is broken - "MEAL" # depends on broken package r-Biobase-2.30.0 - "meboot" # depends on broken package nlopt-2.4.2 - "medflex" # depends on broken package r-car-2.1-0 - "mediation" # depends on broken package r-lme4-1.1-8 - "MEDIPS" # depends on broken package Rsamtools-1.21.8 - "MEDME" # depends on broken package nlopt-2.4.2 - "MEET" # broken build - "MEIGOR" # broken build - "MEMSS" # depends on broken package nlopt-2.4.2 - "MergeMaid" # broken build - "merTools" # depends on broken package r-arm-1.8-6 - "MeSHDbi" # broken build - "meshr" # depends on broken package Category-2.35.1 + "meboot" # depends on broken package nlopt + "medflex" # depends on broken package car + "mediation" # depends on broken package lme4 + "MEDME" # depends on broken package nlopt + "MEMSS" # depends on broken package nlopt + "merTools" # depends on broken package arm "meta4diag" # broken build - "metaArray" # broken build - "Metab" # depends on broken package mzR-2.3.1 - "metabolomics" # broken build - "metabomxtr" # broken build - "metacom" # broken build - "MetaDE" # broken build "metagear" # build is broken - "metagene" # depends on broken package Rsamtools-1.21.8 - "metagenomeFeatures" # depends on broken package r-Biobase-2.30.0 - "metagenomeSeq" # broken build - "metaheur" # depends on broken package r-preprocomb-0.2.0 - "MetaLandSim" # broken build - "metamisc" - "metaMix" # build is broken - "metaMS" # depends on broken package mzR-2.3.1 - "MetaPath" # depends on broken package r-Biobase-2.29.1 - "metaplus" # depends on broken package nlopt-2.4.2 - "metaSEM" # depends on broken package OpenMx-2.2.4 - "metaSeq" # broken build - "metaseqR" # depends on broken package affyio-1.37.0 - "Metatron" # depends on broken package nlopt-2.4.2 - "metaX" # depends on broken package r-CAMERA-1.25.2 - "MethTargetedNGS" # broken build - "methVisual" # broken build - "methyAnalysis" # depends on broken package affyio-1.37.0 - "MethylAid" # depends on broken package Rsamtools-1.21.8 - "methylMnM" # broken build - "methylPipe" # depends on broken package Rsamtools-1.21.8 - "MethylSeekR" # depends on broken package Rsamtools-1.21.8 - "methylumi" # depends on broken package Rsamtools-1.21.8 - "Mfuzz" # broken build - "MGFM" # broken build - "mGSZ" # broken build - "miceadds" # depends on broken package nlopt-2.4.2 - "micEconAids" # depends on broken package nlopt-2.4.2 - "micEconCES" # depends on broken package nlopt-2.4.2 - "micEconSNQP" # depends on broken package nlopt-2.4.2 - "MiChip" # broken build - "microRNA" # broken build - "mi" # depends on broken package nlopt-2.4.2 + "metaheur" # depends on broken package preprocomb + "metamisc" # broken build + "metaplus" # depends on broken package nlopt + "metaSEM" # depends on broken package OpenMx + "Metatron" # depends on broken package nlopt + "miceadds" # depends on broken package nlopt + "micEconAids" # depends on broken package nlopt + "micEconCES" # depends on broken package nlopt + "micEconSNQP" # depends on broken package nlopt + "mi" # depends on broken package nlopt "MigClim" # Build Is Broken - "migui" # depends on broken package nlopt-2.4.2 - "MIMOSA" # broken build - "MineICA" # depends on broken package AnnotationForge-1.11.3 - "minfi" # depends on broken package Rsamtools-1.21.8 - "minimist" # depends on broken package V8-0.6 - "MinimumDistance" # depends on broken package affyio-1.37.0 - "MiPP" # broken build - "MiRaGE" # broken build - "miRcomp" # depends on broken package r-Biobase-2.30.0 - "mirIntegrator" # build is broken - "miRLAB" # broken build - "miRNAtap" # broken build - "miRtest" # broken build - "missDeaths" - "missMDA" # depends on broken package nlopt-2.4.2 - "missMethyl" # depends on broken package Rsamtools-1.21.8 + "migui" # depends on broken package nlopt + "minimist" # depends on broken package V8 + "missMDA" # depends on broken package nlopt "mitoODE" # build is broken - "mixAK" # depends on broken package nlopt-2.4.2 + "mixAK" # depends on broken package nlopt "MixedPoisson" # broken build - "MIXFIM" # build is broken - "mixlm" # depends on broken package nlopt-2.4.2 - "MixMAP" # depends on broken package nlopt-2.4.2 - "MLInterfaces" # broken build - "mlma" # depends on broken package r-lme4-1.1-10 - "mlmRev" # depends on broken package nlopt-2.4.2 - "MLP" # depends on broken package affyio-1.37.0 - "MLSeq" # depends on broken package nlopt-2.4.2 - "mlVAR" # depends on broken package nlopt-2.4.2 - "MM2S" # broken build - "MM2Sdata" # broken build + "mixlm" # depends on broken package nlopt + "MixMAP" # depends on broken package nlopt + "mlma" # depends on broken package lme4 + "mlmRev" # depends on broken package nlopt + "MLSeq" # depends on broken package nlopt + "mlVAR" # depends on broken package nlopt "MM" # broken build - "MMDiff" # depends on broken package AnnotationForge-1.11.3 - "mmnet" # broken build - "MmPalateMiRNA" # depends on broken package affyio-1.37.0 - "mogsa" # broken build - "molaR" # depends on broken package r-geomorph-2.1.7-1 "mongolite" # build is broken - "monocle" # build is broken - "monogeneaGM" # broken build - "MonoPhy" # depends on broken package r-phytools-0.5-00 - "MoPS" # broken build - "morse" - "mosaic" # depends on broken package nlopt-2.4.2 - "mosaics" # broken build - "motifbreakR" # depends on broken package r-BSgenome-1.37.5 - "MotifDb" # depends on broken package Rsamtools-1.21.8 - "motifRG" # depends on broken package Rsamtools-1.21.8 - "motifStack" # depends on broken package Rsamtools-1.21.8 - "MotIV" # depends on broken package Rsamtools-1.21.8 + "morse" # broken build + "mosaic" # depends on broken package nlopt "mpoly" # broken build "mRMRe" # broken build "msa" # broken build - "msarc" # broken build - "MSeasy" # depends on broken package mzR-2.3.1 - "MSeasyTkGUI" # depends on broken package mzR-2.3.1 - "MSGFgui" # depends on broken package MSGFplus-1.3.0 + "MSGFgui" # depends on broken package MSGFplus "MSGFplus" # Build Is Broken - "MSIseq" # broken build - "msmsEDA" # depends on broken package affyio-1.37.0 - "msmsTests" # depends on broken package affyio-1.37.0 - "MSnbase" # depends on broken package affyio-1.37.0 - "MSnID" # depends on broken package affyio-1.37.0 - "MSstats" # depends on broken package nlopt-2.4.2 - "msSurv" # broken build - "Mulcom" # broken build - "multiDimBio" # depends on broken package nlopt-2.4.2 - "MultiRR" # depends on broken package nlopt-2.4.2 - "multiscan" # broken build - "multtest" # broken build - "muma" # depends on broken package nlopt-2.4.2 - "munsellinterpol" - "muscle" # broken build - "mutoss" # broken build + "MSstats" # depends on broken package nlopt + "MultiRR" # depends on broken package nlopt + "muma" # depends on broken package nlopt + "munsellinterpol" # broken build "mutossGUI" # build is broken - "mvGST" # depends on broken package AnnotationForge-1.11.3 - "mvinfluence" # depends on broken package nlopt-2.4.2 - "mvMORPH" # broken build + "mvinfluence" # depends on broken package nlopt "MXM" # broken build - "mygene" # depends on broken package Rsamtools-1.21.8 - "myTAI" # broken build - "myvariant" # depends on broken package r-VariantAnnotation-1.15.31 - "mzID" # broken build - "mzR" # build is broken "NanoStringDiff" # broken build - "NanoStringNorm" # depends on broken package r-vsn-3.38.0 "NanoStringQCPro" # build is broken - "NAPPA" # depends on broken package r-vsn-3.38.0 - "NarrowPeaks" # broken build - "nCal" # depends on broken package nlopt-2.4.2 + "nCal" # depends on broken package nlopt "ncdfFlow" # build is broken - "NCIgraph" # depends on broken package RCytoscape-1.19.0 - "ndtv" # broken build - "nem" # broken build - "netbenchmark" # build is broken - "netClass" # broken build - "nethet" # broken build - "NetPreProc" # depends on broken package graph-1.48.0 - "netresponse" # broken build - "NetSAM" # broken build - "nettools" # depends on broken package WGCNA-1.47 - "NGScopy" - "nhanesA" # broken build - "NHPoisson" # depends on broken package nlopt-2.4.2 - "NIPTeR" # depends on broken package r-Rsamtools-1.21.18 - "nloptr" # depends on broken package nlopt-2.4.2 + "NCIgraph" # depends on broken package RCytoscape + "NHPoisson" # depends on broken package nlopt + "nloptr" # depends on broken package nlopt "nlsem" # broken build "nlts" # broken build - "NOISeq" # broken build - "nondetects" # depends on broken package affyio-1.37.0 - "nonrandom" # depends on broken package nlopt-2.4.2 - "NormqPCR" # depends on broken package affyio-1.37.0 + "nonrandom" # depends on broken package nlopt "NORRRM" # build is broken - "npGSEA" # broken build - "npIntFactRep" # depends on broken package nlopt-2.4.2 + "npIntFactRep" # depends on broken package nlopt "NSM3" # broken build - "nucleR" # depends on broken package Rsamtools-1.21.8 - "OCplus" # broken build - "OGSA" # broken build - "oligoClasses" # depends on broken package affyio-1.37.0 - "oligo" # depends on broken package affyio-1.37.0 - "OmicCircos" # broken build - "omics" # depends on broken package lme4-1.1-10 - "OmicsMarkeR" # depends on broken package nlopt-2.4.2 - "OncoSimulR" # broken build - "oneChannelGUI" # depends on broken package affyio-1.37.0 + "omics" # depends on broken package lme4 + "OmicsMarkeR" # depends on broken package nlopt "OPDOE" # broken build "OpenCL" # build is broken - "opencpu" # broken build - "openCyto" # depends on broken package ncdfFlow-2.15.2 + "openCyto" # depends on broken package ncdfFlow "OpenMx" # build is broken - "openssl" - "OperaMate" # depends on broken package Category-2.35.1 - "oposSOM" # broken build - "optBiomarker" # depends on broken package rpanel-1.1-3 - "ora" # depends on broken package ROracle-1.1-12 - "ordBTL" # depends on broken package nlopt-2.4.2 - "OrderedList" # broken build - "ordPens" # depends on broken package r-lme4-1.1-9 - "OrganismDbi" # depends on broken package Rsamtools-1.21.8 - "orQA" # broken build + "optBiomarker" # depends on broken package rpanel + "ora" # depends on broken package ROracle + "ordBTL" # depends on broken package nlopt + "ordPens" # depends on broken package lme4 "orthopolynom" # broken build - "OTUbase" # depends on broken package Rsamtools-1.21.8 - "OutlierD" # broken build - "OUwie" # depends on broken package nlopt-2.4.2 + "OUwie" # depends on broken package nlopt "oz" # broken build "PAA" # broken build - "pacman" # broken build - "PADOG" # build is broken - "paircompviz" # broken build - "PairViz" # broken build - "paleotree" # broken build - "pamm" # depends on broken package nlopt-2.4.2 - "PANDA" # build is broken - "panelAR" # depends on broken package nlopt-2.4.2 - "PAnnBuilder" # broken build - "panp" # depends on broken package affyio-1.37.0 - "papeR" # depends on broken package nlopt-2.4.2 - "PAPi" # broken build - "parboost" # depends on broken package nlopt-2.4.2 - "parglms" # broken build - "parma" # depends on broken package nlopt-2.4.2 + "pamm" # depends on broken package nlopt + "panelAR" # depends on broken package nlopt + "papeR" # depends on broken package nlopt + "parboost" # depends on broken package nlopt + "parma" # depends on broken package nlopt "partitions" # broken build - "Pasha" # depends on broken package GenomicAlignments-1.5.12 - "pathClass" # depends on broken package affyio-1.37.0 - "pathRender" # build is broken - "pathview" # build is broken "PatternClass" # build is broken - "Pbase" # depends on broken package affyio-1.37.0 - "pbdBASE" # depends on broken package pbdSLAP-0.2-0 - "PBD" # broken build - "pbdDEMO" # depends on broken package pbdSLAP-0.2-0 - "pbdDMAT" # depends on broken package pbdSLAP-0.2-0 - "pbdSLAP" # build is broken - "PBImisc" # depends on broken package nlopt-2.4.2 - "pbkrtest" # depends on broken package nlopt-2.4.2 - "PBSddesolve" # build is broken - "PBSmapping" # build is broken - "pcaBootPlot" # depends on broken FactoMineR-1.31.3 - "pcaGoPromoter" # broken build + "PBImisc" # depends on broken package nlopt + "pcaBootPlot" # depends on broken FactoMineR "pcaL1" # build is broken - "pcalg" # broken build - "pcaMethods" # broken build - "PCGSE" # broken build - "pcnetmeta" - "pcot2" # broken build - "PCpheno" # depends on broken package Category-2.35.1 - "PCS" # broken build - "pdInfoBuilder" # depends on broken package affyio-1.37.0 - "pdmclass" # build is broken + "pcnetmeta" # broken build "PDQutils" # broken build - "PECA" # depends on broken package affyio-1.37.0 - "pedigreemm" # depends on broken package nlopt-2.4.2 - "pedometrics" # depends on broken package nlopt-2.4.2 - "PepPrep" # broken build - "pepStat" # broken build - "pequod" # depends on broken package nlopt-2.4.2 - "PerfMeas" # broken build - "PGA" # depends on broken package Rsamtools-1.21.8 - "pglm" # depends on broken package car-2.1-1 - "PGSEA" # depends on broken package annaffy-1.41.1 - "phangorn" # depends on broken package Biostrings-2.38.2 - "PharmacoGx" - "phenoDist" # depends on broken package Category-2.35.1 - "phenoTest" # depends on broken package Category-2.35.1 - "PhenStat" # depends on broken package nlopt-2.4.2 - "phia" # depends on broken package nlopt-2.4.2 - "phreeqc" # broken build - "phylocurve" # depends on broken package nlopt-2.4.2 - "phyloseq" # broken build - "PhySortR" # depends on broken package phytools-0.5-10 - "phytools" # broken build - "piano" # broken build - "PICS" # depends on broken package Rsamtools-1.21.8 - "piecewiseSEM" # depends on broken package r-lme4-1.1-10 - "PING" # depends on broken package Rsamtools-1.21.8 - "pkgDepTools" # broken build - "plateCore" # depends on broken package ncdfFlow-2.15.2 - "plethy" # broken build + "pedigreemm" # depends on broken package nlopt + "pequod" # depends on broken package nlopt + "pglm" # depends on broken package car + "PhenStat" # depends on broken package nlopt + "phia" # depends on broken package nlopt + "phylocurve" # depends on broken package nlopt + "piecewiseSEM" # depends on broken package lme4 + "plateCore" # depends on broken package ncdfFlow "plfMA" # broken build - "plgem" # broken build - "plier" # depends on broken package affyio-1.37.0 - "plm" # depends on broken package car-2.1-1 - "PLPE" # broken build - "plrs" # broken build - "plsRbeta" # depends on broken package nlopt-2.4.2 - "plsRcox" # depends on broken package nlopt-2.4.2 - "plsRglm" # depends on broken package nlopt-2.4.2 - "plw" # depends on broken package affyio-1.37.0 - "pmclust" # build is broken - "pmm" # depends on broken package nlopt-2.4.2 - "podkat" # depends on broken package Rsamtools-1.21.8 - "polyester" # broken build - "Polyfit" # broken build + "plm" # depends on broken package car + "plsRbeta" # depends on broken package nlopt + "plsRcox" # depends on broken package nlopt + "plsRglm" # depends on broken package nlopt + "pmm" # depends on broken package nlopt "polynom" # broken build - "pomp" # depends on broken package nlopt-2.4.2 - "poppr" # depends on broken package Biostrings-2.38.2 - "popprxl" # depends on broken package Biostrings-2.38.2 - "ppiPre" # depends on broken package GOSemSim-1.27.3 - "ppiStats" # depends on broken package Category-2.35.1 - "prada" # broken build - "prebs" # depends on broken package affyio-1.37.0 - "PREDA" # broken build - "predictionet" # broken build - "predictmeans" # depends on broken package nlopt-2.4.2 - "preprocomb" # depends on broken package r-caret-6.0-58 - "prevalence" - "pRF" # broken build - "prLogistic" # depends on broken package nlopt-2.4.2 - "proBAMr" # depends on broken package Rsamtools-1.21.8 - "ProCoNA" # depends on broken package AnnotationForge-1.11.3 - "pRoloc" # depends on broken package nlopt-2.4.2 - "pRolocGUI" # depends on broken package nlopt-2.4.2 - "PROMISE" # broken build - "PROPER" # broken build - "propOverlap" # broken build - "Prostar" # depends on broken package r-imputeLCMD-2.0 - "prot2D" # broken build - "ProteomicsAnnotationHubData" # depends on broken package r-AnnotationHub-2.1.40 - "proteoQC" # depends on broken package affyio-1.37.0 - "ProtGenerics" # broken build - "protiq" # broken build - "provenance" # broken build - "PSAboot" # depends on broken package nlopt-2.4.2 - "PSEA" # broken build - "PSICQUIC" # broken build - "ptw" # depends on broken nloptr-1.0.4 - "puma" # depends on broken package affyio-1.37.0 - "PurBayes" - "purge" # depends on broken package r-lme4-1.1-9 - "pvac" # depends on broken package affyio-1.37.0 - "PVAClone" - "pvca" # depends on broken package nlopt-2.4.2 - "Pviz" # depends on broken package Rsamtools-1.21.8 - "PWMEnrich" # broken build - "pwOmics" # depends on broken package interactiveDisplayBase-1.7.0 - "PythonInR" - "qcmetrics" # build is broken - "QDNAseq" # depends on broken package Rsamtools-1.21.8 - "QFRM" - "qgraph" # depends on broken package nlopt-2.4.2 - "qpcrNorm" # depends on broken package affyio-1.37.0 - "qpgraph" # depends on broken package Rsamtools-1.21.8 - "qrqc" # depends on broken package Rsamtools-1.21.8 + "pomp" # depends on broken package nlopt + "predictmeans" # depends on broken package nlopt + "preprocomb" # depends on broken package caret + "prevalence" # broken build + "prLogistic" # depends on broken package nlopt + "pRoloc" # depends on broken package nlopt + "pRolocGUI" # depends on broken package nlopt + "PSAboot" # depends on broken package nlopt + "ptw" # depends on broken nloptr + "PurBayes" # broken build + "PVAClone" # broken build + "pvca" # depends on broken package nlopt + "PythonInR" # broken build + "QFRM" # broken build + "qgraph" # depends on broken package nlopt "qtbase" # build is broken - "qtlnet" # depends on broken package nlopt-2.4.2 - "qtpaint" # depends on broken package qtbase-1.0.9 - "qtutils" # depends on broken package qtbase-1.0.9 - "QuACN" # broken build - "QUALIFIER" # depends on broken package ncdfFlow-2.15.2 - "quantification" # depends on broken package nlopt-2.4.2 - "quantro" # depends on broken package Rsamtools-1.21.8 + "qtlnet" # depends on broken package nlopt + "qtpaint" # depends on broken package qtbase + "qtutils" # depends on broken package qtbase + "QUALIFIER" # depends on broken package ncdfFlow + "quantification" # depends on broken package nlopt "QuartPAC" # broken build - "QuasiSeq" # broken build - "QuasR" # depends on broken package Rsamtools-1.21.8 - "qusage" # broken build - "R2jags" - "R2STATS" # depends on broken package nlopt-2.4.2 - "R3CPET" # depends on broken package Rsamtools-1.21.8 - "r3Cseq" # depends on broken package Rsamtools-1.21.8 - "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8 - "RADami" # broken build + "R2jags" # broken build + "R2STATS" # depends on broken package nlopt "rain" # broken build "raincpc" # build is broken "rainfreq" # build is broken - "RAM" # broken build - "RamiGO" # depends on broken package RCytoscape-1.19.0 - "randPack" # broken build - "RANKS" # depends on broken package graph-1.48.0 - "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76 - "RAPIDR" # depends on broken package Rsamtools-1.21.8 - "RareVariantVis" # depends on broken VariantAnnotation-1.15.19 - "Rariant" # depends on broken package Rsamtools-1.21.8 - "rasclass" # depends on broken package nlopt-2.4.2 - "rase" # broken build + "RamiGO" # depends on broken package RCytoscape + "RareVariantVis" # depends on broken VariantAnnotation + "rasclass" # depends on broken package nlopt "rationalfun" # broken build - "RbcBook1" # broken build - "RBerkeley" - "RBGL" # broken build - "RBioinf" # broken build - "RbioRXN" # depends on broken package ChemmineR-2.21.7 + "RBerkeley" # broken build + "RbioRXN" # depends on broken package ChemmineR "Rblpapi" # broken build - "rbsurv" # broken build - "rbundler" # broken build - "Rcade" # depends on broken package Rsamtools-1.21.8 - "rcellminer" # broken build - "rCGH" # depends on broken package r-affy-1.47.1 - "Rchemcpp" # depends on broken package ChemmineR-2.21.7 - "rchess" # depends on broken package r-V8-0.9 - "Rchoice" # depends on broken package car-2.1 - "RchyOptimyx" # broken build - "Rcmdr" # depends on broken package nlopt-2.4.2 - "RcmdrMisc" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_BCA" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_coin" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_depthTools" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_DoE" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_doex" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_EACSPIR" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_EBM" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_EcoVirtual" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_epack" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_Export" # depends on broken package r-Rcmdr-2.2-3 - "RcmdrPlugin_EZR" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_FactoMineR" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_HH" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_IPSUR" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_KMggplot2" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_lfstat" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_MA" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_mosaic" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_MPAStats" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_NMBU" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_orloca" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_plotByGroup" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_pointG" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_qual" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_RMTCJags" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_ROC" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_sampling" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_SCDA" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_seeg" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_SLC" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_SM" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_sos" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_steepness" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_survival" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_TeachingDemos" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_temis" # depends on broken package nlopt-2.4.2 - "RcmdrPlugin_UCA" # depends on broken package nlopt-2.4.2 - "Rcpi" # depends on broken package ChemmineR-2.21.7 + "Rchemcpp" # depends on broken package ChemmineR + "rchess" # depends on broken package V8 + "Rchoice" # depends on broken package car + "Rcmdr" # depends on broken package nlopt + "RcmdrMisc" # depends on broken package nlopt + "RcmdrPlugin_BCA" # depends on broken package nlopt + "RcmdrPlugin_coin" # depends on broken package nlopt + "RcmdrPlugin_depthTools" # depends on broken package nlopt + "RcmdrPlugin_DoE" # depends on broken package nlopt + "RcmdrPlugin_doex" # depends on broken package nlopt + "RcmdrPlugin_EACSPIR" # depends on broken package nlopt + "RcmdrPlugin_EBM" # depends on broken package nlopt + "RcmdrPlugin_EcoVirtual" # depends on broken package nlopt + "RcmdrPlugin_epack" # depends on broken package nlopt + "RcmdrPlugin_Export" # depends on broken package Rcmdr + "RcmdrPlugin_EZR" # depends on broken package nlopt + "RcmdrPlugin_FactoMineR" # depends on broken package nlopt + "RcmdrPlugin_HH" # depends on broken package nlopt + "RcmdrPlugin_IPSUR" # depends on broken package nlopt + "RcmdrPlugin_KMggplot2" # depends on broken package nlopt + "RcmdrPlugin_lfstat" # depends on broken package nlopt + "RcmdrPlugin_MA" # depends on broken package nlopt + "RcmdrPlugin_mosaic" # depends on broken package nlopt + "RcmdrPlugin_MPAStats" # depends on broken package nlopt + "RcmdrPlugin_NMBU" # depends on broken package nlopt + "RcmdrPlugin_orloca" # depends on broken package nlopt + "RcmdrPlugin_plotByGroup" # depends on broken package nlopt + "RcmdrPlugin_pointG" # depends on broken package nlopt + "RcmdrPlugin_qual" # depends on broken package nlopt + "RcmdrPlugin_RMTCJags" # depends on broken package nlopt + "RcmdrPlugin_ROC" # depends on broken package nlopt + "RcmdrPlugin_sampling" # depends on broken package nlopt + "RcmdrPlugin_SCDA" # depends on broken package nlopt + "RcmdrPlugin_seeg" # depends on broken package nlopt + "RcmdrPlugin_SLC" # depends on broken package nlopt + "RcmdrPlugin_SM" # depends on broken package nlopt + "RcmdrPlugin_sos" # depends on broken package nlopt + "RcmdrPlugin_steepness" # depends on broken package nlopt + "RcmdrPlugin_survival" # depends on broken package nlopt + "RcmdrPlugin_TeachingDemos" # depends on broken package nlopt + "RcmdrPlugin_temis" # depends on broken package nlopt + "RcmdrPlugin_UCA" # depends on broken package nlopt + "Rcpi" # depends on broken package ChemmineR "Rcplex" # Build Is Broken "RcppAPT" # Build Is Broken - "RcppOctave" # build is broken "RcppRedis" # build is broken "rcrypt" # broken build - "RCy3" # depends on broken package r-graph-1.48.0 - "RCyjs" # broken build "RCytoscape" # Build Is Broken - "RDAVIDWebService" # depends on broken package Category-2.35.1 - "rdd" # depends on broken package nlopt-2.4.2 - "rddtools" # depends on broken package r-AER-1.2-4 + "rdd" # depends on broken package nlopt + "rddtools" # depends on broken package AER "rDEA" # build is broken "RDieHarder" # build is broken - "ReactomePA" # depends on broken package GOSemSim-1.27.3 - "ReadqPCR" # depends on broken package affyio-1.37.0 - "REBayes" # depends on broken package Rmosek-1.2.5.1 - "reb" # broken build - "recluster" # broken build - "REDseq" # depends on broken package Rsamtools-1.21.8 - "referenceIntervals" # depends on broken package nlopt-2.4.2 - "RefNet" # depends on broken package interactiveDisplayBase-1.7.0 - "RefPlus" # depends on broken package affyio-1.37.0 - "refund" # depends on broken package nlopt-2.4.2 - "refund_shiny" # depends on broken package r-refund-0.1-13 - "regioneR" # depends on broken package Rsamtools-1.21.8 - "regionReport" # depends on broken package Rsamtools-1.21.8 - "regRSM" # broken build - "REndo" # depends on broken package AER-1.2-4 - "repijson" # depends on broken package V8-0.6 - "Repitools" # depends on broken package affyio-1.37.0 - "ReportingTools" # depends on broken package Category-2.35.1 - "ReQON" # depends on broken package Rsamtools-1.21.8 - "rerddap" # broken build - "REST" # depends on broken package nlopt-2.4.2 - "rfPred" # depends on broken package Rsamtools-1.21.8 - "rGADEM" # depends on broken package Rsamtools-1.21.8 - "RGalaxy" # broken build - "rgbif" # depends on broken package V8-0.6 - "Rgnuplot" - "rgp" # build is broken - "rgpui" # depends on broken package rgp-0.4-1 - "Rgraphviz" # broken build - "rGREAT" # broken build - "RGSEA" # broken build - "rgsepd" # depends on broken package goseq-1.21.1 + "REBayes" # depends on broken package Rmosek + "referenceIntervals" # depends on broken package nlopt + "refund" # depends on broken package nlopt + "refund_shiny" # depends on broken package refund + "REndo" # depends on broken package AER + "repijson" # depends on broken package V8 + "REST" # depends on broken package nlopt + "rgbif" # depends on broken package V8 + "Rgnuplot" # broken build "rhdf5" # build is broken - "rHVDM" # depends on broken package affyio-1.37.0 - "RiboProfiling" # depends on broken package r-BiocGenerics-0.16.1 - "riboSeqR" # broken build - "Ringo" # depends on broken package affyio-1.37.0 - "RIPSeeker" # depends on broken package Rsamtools-1.21.8 - "Risa" # depends on broken package affyio-1.37.0 - "rjade" # depends on broken package V8-0.6 - "rjags" + "rjade" # depends on broken package V8 + "rjags" # broken build "rJPSGCS" # build is broken "rLindo" # build is broken - "RLRsim" # depends on broken package r-lme4-1.1-9 - "Rmagpie" # broken build + "RLRsim" # depends on broken package lme4 "RMallow" # broken build - "RMassBank" # depends on broken package mzR-2.3.1 "rMAT" # build is broken - "rmgarch" # depends on broken package nlopt-2.4.2 - "rminer" # depends on broken package nlopt-2.4.2 - "RmiR" # Build Is Broken + "rmgarch" # depends on broken package nlopt + "rminer" # depends on broken package nlopt "Rmosek" # build is broken - "rmumps" # build is broken "RMySQL" # broken build - "RNAinteract" # depends on broken package Category-2.35.1 - "RNAither" # depends on broken package nlopt-2.4.2 - "RNAprobR" # depends on broken package Rsamtools-1.21.8 - "rnaSeqMap" # depends on broken package Rsamtools-1.21.8 - "RnaSeqSampleSize" # Build Is Broken + "RNAither" # depends on broken package nlopt "RnavGraph" # build is broken - "RnBeads" # depends on broken package Rsamtools-1.21.8 "rnetcarto" # broken build - "Rnits" # depends on broken package affyio-1.37.0 - "rNOMADS" # broken build - "roar" # depends on broken package Rsamtools-1.21.8 - "RobLoxBioC" # depends on broken package affyio-1.37.0 - "RobLox" # broken build - "robustlmm" # depends on broken package nlopt-2.4.2 - "rockchalk" # depends on broken package nlopt-2.4.2 - "RockFab" # broken build - "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20 - "Roleswitch" # broken build - "Rolexa" # depends on broken package Rsamtools-1.21.8 + "robustlmm" # depends on broken package nlopt + "rockchalk" # depends on broken package nlopt + "ROI_plugin_symphony" # depends on broken package Rsymphony "rols" # build is broken - "ROntoTools" # broken build "ROracle" # Build Is Broken - "RPA" # depends on broken package affyio-1.37.0 "rpanel" # build is broken - "Rphylopars" # broken build "Rpoppler" # broken build - "RPPanalyzer" # broken build - "RpsiXML" # broken build - "rpubchem" # depends on broken package nlopt-2.4.2 - "Rqc" # depends on broken package Rsamtools-1.21.8 + "rpubchem" # depends on broken package nlopt "RQuantLib" # build is broken - "rqubic" # broken build - "rr" # depends on broken package nlopt-2.4.2 - "rRDP" # broken build - "RRreg" # depends on broken package r-lme4-1.1-10 - "Rsamtools" # Build Is Broken + "rr" # depends on broken package nlopt + "RRreg" # depends on broken package lme4 "RSAP" # build is broken "rsbml" # build is broken - "rscala" # build is broken - "RSDA" # depends on broken package nlopt-2.4.2 - "RSeed" # broken build - "rSFFreader" # depends on broken package Rsamtools-1.21.8 - "Rsomoclu" - "rstan" # build is broken - "RStoolbox" # depends on broken package r-caret-6.0-52 - "Rsubread" # Build Is Broken - "RSVSim" # depends on broken package Rsamtools-1.21.8 + "RSDA" # depends on broken package nlopt + "Rsomoclu" # broken build + "RStoolbox" # depends on broken package caret "Rsymphony" # build is broken "rTableICC" # broken build "rTANDEM" # build is broken - "RTCA" # broken build - "RTCGA" # depends on broken package r-rvest-0.3.0 - "RTN" # depends on broken package nlopt-2.4.2 - "RTopper" # broken build - "rtracklayer" # depends on broken package Rsamtools-1.21.8 - "Rtreemix" # broken build - "rTRM" # broken build - "rTRMui" # depends on broken package Rsamtools-1.21.8 - "rugarch" # depends on broken package nlopt-2.4.2 + "RTN" # depends on broken package nlopt + "rugarch" # depends on broken package nlopt "rUnemploymentData" # broken build - "RUVcorr" # build is broken - "RUVnormalize" # Build Is Broken - "RUVSeq" # depends on broken package Rsamtools-1.21.8 - "RVAideMemoire" # depends on broken package nlopt-2.4.2 - "rvest" # broken build - "RVFam" # depends on broken package nlopt-2.4.2 - "RVideoPoker" # depends on broken package rpanel-1.1-3 + "RVAideMemoire" # depends on broken package nlopt + "RVFam" # depends on broken package nlopt + "RVideoPoker" # depends on broken package rpanel "RWebServices" # broken build - "ryouready" # depends on broken package nlopt-2.4.2 - "S4Vectors" # broken build + "ryouready" # depends on broken package nlopt "sadists" # broken build - "safe" # broken build - "SAGx" # broken build - "sampleSelection" # depends on broken package nlopt-2.4.2 - "sangerseqR" # broken build - "sapFinder" # depends on broken package rTANDEM-1.9.0 - "saps" # broken build - "SCAN_UPC" # depends on broken package affyio-1.37.0 - "scholar" # depends on broken package r-rvest-0.3.1 - "ScISI" # depends on broken package apComplex-2.35.0 - "scmamp" # broken build - "scsR" # broken build - "sdcMicro" # depends on broken package nlopt-2.4.2 - "sdcMicroGUI" # depends on broken package nlopt-2.4.2 - "SDD" # depends on broken package rpanel-1.1-3 - "seeg" # depends on broken package nlopt-2.4.2 - "segmentSeq" # depends on broken package Rsamtools-1.21.8 - "sejmRP" # depends on broken package r-rvest-0.3.0 + "sampleSelection" # depends on broken package nlopt + "sapFinder" # depends on broken package rTANDEM + "sdcMicro" # depends on broken package nlopt + "sdcMicroGUI" # depends on broken package nlopt + "SDD" # depends on broken package rpanel + "seeg" # depends on broken package nlopt "Sejong" # broken build - "SELEX" # broken build - "sem" # depends on broken package nlopt-2.4.2 - "semdiag" # depends on broken package nlopt-2.4.2 - "SemDist" # Build Is Broken - "semGOF" # depends on broken package nlopt-2.4.2 - "semPlot" # depends on broken package nlopt-2.4.2 - "SensMixed" # depends on broken package r-lme4-1.1-9 - "SensoMineR" # depends on broken package nlopt-2.4.2 - "SEPA" # depends on broken package topGO-2.21.0 - "seq2pathway" # depends on broken package WGCNA-1.47 - "SeqArray" # depends on broken package Rsamtools-1.21.8 - "seqbias" # depends on broken package Rsamtools-1.21.8 + "sem" # depends on broken package nlopt + "semdiag" # depends on broken package nlopt + "semGOF" # depends on broken package nlopt + "semPlot" # depends on broken package nlopt + "SensMixed" # depends on broken package lme4 + "SensoMineR" # depends on broken package nlopt "seqCNA" # build is broken "SeqFeatR" # broken build "SeqGrapheR" # Build Is Broken - "SeqGSEA" # broken build - "seqHMM" # depends on broken package nloptr-1.0.4 - "seqPattern" # broken build - "seqplots" # depends on broken package Rsamtools-1.21.8 + "seqHMM" # depends on broken package nloptr "seqTools" # build is broken - "sequenza" # broken build - "SeqVarTools" # depends on broken package Rsamtools-1.21.8 - "SGSeq" # depends on broken package Rsamtools-1.21.8 "SharpeR" # broken build - "sharx" - "shinyMethyl" # depends on broken package Rsamtools-1.21.8 - "shinyTANDEM" # depends on broken package rTANDEM-1.9.0 - "ShortRead" # depends on broken package Rsamtools-1.21.8 - "Shrinkage" # depends on broken package r-multtest-2.25.2 - "SIBER" - "SICtools" # depends on broken package r-Biostrings-2.38.2 - "SID" # broken build - "sigaR" # broken build - "SigCheck" # broken build - "SigFuge" # broken build - "siggenes" # broken build - "sigsquared" # broken build - "SigTree" # broken build - "SIMAT" # depends on broken package mzR-2.3.1 - "SimBindProfiles" # depends on broken package affyio-1.37.0 - "SIM" # broken build - "similaRpeak" # depends on broken package Rsamtools-1.21.8 - "simmr" - "simpleaffy" # depends on broken package affyio-1.37.0 - "simPop" # depends on broken package r-VIM-4.4.1 - "SimRAD" # depends on broken package Rsamtools-1.21.8 - "simr" # depends on broken package r-lme4-1.1-10 - "SimReg" # broken build - "simulatorZ" # broken build - "sirt" # depends on broken package nlopt-2.4.2 - "SISPA" # depends on broken package r-GSVA-1.18.0 + "sharx" # broken build + "shinyTANDEM" # depends on broken package rTANDEM + "SIBER" # broken build + "simmr" # broken build + "simPop" # depends on broken package VIM + "simr" # depends on broken package lme4 "SJava" # broken build - "sjPlot" # depends on broken package nlopt-2.4.2 - "skewr" # depends on broken package affyio-1.37.0 - "SLGI" # depends on broken package apComplex-2.35.0 + "sjPlot" # depends on broken package nlopt "smacof" # broken build "SNAGEE" # build is broken - "snapCGH" # depends on broken package tilingArray-1.47.0 - "snm" # depends on broken package nlopt-2.4.2 - "SNPchip" # depends on broken package affyio-1.37.0 - "snpEnrichment" # depends on broken package snpStats-1.19.0 - "SNPhood" # depends on broken package r-BiocGenerics-0.16.1 - "snplist" # broken build - "snpStats" # build is broken - "snpStatsWriter" # depends on broken package snpStats-1.19.0 - "SNPtools" # depends on broken package Rsamtools-1.21.8 - "SOD" # depends on broken package cudatoolkit-5.5.22 + "snm" # depends on broken package nlopt + "SOD" # depends on broken package cudatoolkit "sodium" # broken build - "soGGi" # depends on broken package Rsamtools-1.21.8 - "soilphysics" # depends on broken package rpanel-1.1-3 - "SomatiCA" # broken build - "SomaticSignatures" # depends on broken package Rsamtools-1.21.8 + "soilphysics" # depends on broken package rpanel "sortinghat" # broken build - "SoyNAM" # depends on broken package r-lme4-1.1-8 - "SpacePAC" # broken build - "spacom" # depends on broken package nlopt-2.4.2 - "spade" # broken build - "SparseLearner" # depends on broken package r-qgraph-1.3.1 - "spdynmod" # broken build - "specificity" # depends on broken package nlopt-2.4.2 - "specmine" # depends on broken package r-caret-6.0-58 - "SpeCond" # broken build - "SPEM" # broken build - "SPIA" # broken build - "spkTools" # broken build - "splicegear" # broken build - "spliceR" # depends on broken package Rsamtools-1.21.8 - "spliceSites" # broken build - "SplicingGraphs" # depends on broken package Rsamtools-1.21.8 - "splm" # depends on broken package car-2.1-1 - "spocc" # depends on broken package V8-0.6 - "spoccutils" # depends on broken spocc-0.3.0 - "spsann" # depends on broken package r-pedometrics-0.6-2 - "SRAdb" # broken build - "srd" # broken build - "sscore" # depends on broken package affyio-1.37.0 - "ssizeRNA" # broken build - "ssmrob" # depends on broken package nlopt-2.4.2 - "ssviz" # depends on broken package Rsamtools-1.21.8 - "stagePop" # depends on broken package PBSddesolve-1.11.29 - "staRank" # depends on broken package Category-2.35.1 - "Starr" # depends on broken package affyio-1.37.0 - "STATegRa" # depends on broken package affyio-1.37.0 - "StatMethRank" - "Statomica" # broken build - "stcm" # depends on broken package nlopt-2.4.2 - "stepp" # depends on broken package nlopt-2.4.2 - "stepwiseCM" # broken build - "stream" # broken build - "Streamer" # broken build - "streamMOA" # broken build + "SoyNAM" # depends on broken package lme4 + "spacom" # depends on broken package nlopt + "SparseLearner" # depends on broken package qgraph + "specificity" # depends on broken package nlopt + "specmine" # depends on broken package caret + "splm" # depends on broken package car + "spocc" # depends on broken package V8 + "spoccutils" # depends on broken spocc + "ssmrob" # depends on broken package nlopt + "StatMethRank" # broken build + "stepp" # depends on broken package nlopt "stringgaussnet" # build is broken - "structSSI" # broken build - "strum" # broken build - "subSeq" # depends on broken package r-Biobase-2.30.0 - "SummarizedExperiment" # broken build - "superbiclust" # broken build - "Surrogate" # depends on broken package nlopt-2.4.2 - "Sushi" # broken build - "sva" # broken build - "svglite" # depends on broken package gdtools-0.0.6 - "SVM2CRM" # depends on broken package Rsamtools-1.21.8 + "Surrogate" # depends on broken package nlopt + "svglite" # depends on broken package gdtools "sybilSBML" # build is broken - "synapter" # depends on broken package affyio-1.37.0 - "synchronicity" # build is broken - "synthpop" # build is broken - "systemfit" # depends on broken package nlopt-2.4.2 - "systemPipeR" # depends on broken package AnnotationForge-1.11.3 - "TargetSearch" # depends on broken package mzR-2.3.1 - "TarSeqQC" # depends on broken package r-BiocGenerics-0.16.1 - "TCC" # broken build - "TCGA2STAT" # broken build - "TCGAbiolinks" # depends on broken package r-affy-1.47.1 - "TcGSA" # depends on broken package nlopt-2.4.2 - "TDARACNE" # broken build - "TDMR" # depends on broken package nlopt-2.4.2 - "TED" # broken build - "TEQC" # depends on broken package Rsamtools-1.21.8 - "TextoMineR" # depends on broken package FactoMineR-1.31.4 - "TFBSTools" # depends on broken package DirichletMultinomial-1.11.1 - "tigerstats" # depends on broken package nlopt-2.4.2 - "tigre" # broken build - "tilingArray" # depends on broken package affyio-1.37.0 - "timecourse" # broken build - "timeSeq" # broken build - "timetree" # depends on broken package Biostrings-2.38.2 - "TIN" # depends on broken package WGCNA-1.47 - "TitanCNA" # depends on broken package Rsamtools-1.21.8 - "TKF" # broken build - "TLBC" # depends on broken package r-caret-6.0-58 + "systemfit" # depends on broken package nlopt + "TcGSA" # depends on broken package nlopt + "TDMR" # depends on broken package nlopt + "TextoMineR" # depends on broken package FactoMineR + "TFBSTools" # depends on broken package DirichletMultinomial + "tigerstats" # depends on broken package nlopt + "TLBC" # depends on broken package caret "tmle" # broken build - "tnam" # depends on broken package r-lme4-1.1-9 - "tolBasis" # depends on broken package r-polynom-1.3-8 - "ToPASeq" # depends on broken package Rsamtools-1.21.8 - "topGO" # build is broken - "topologyGSA" # depends on broken package Rsamtools-1.21.8 - "TPP" # broken build - "tracktables" # depends on broken package Rsamtools-1.21.8 - "trackViewer" # depends on broken package Rsamtools-1.21.8 - "translateSPSS2R" # depends on broken car-2.0-25 - "tRanslatome" # depends on broken package GOSemSim-1.27.3 - "TransView" # depends on broken package Rsamtools-1.21.8 - "traseR" - "treescape" # depends on broken package Biostrings-2.38.2 - "triform" # broken build - "trigger" # broken build - "TriMatch" # depends on broken package nlopt-2.4.2 - "triplex" # broken build - "TROM" # depends on broken package topGO-2.21.0 - "TRONCO" # broken build - "TSdist" # broken build + "tnam" # depends on broken package lme4 + "tolBasis" # depends on broken package polynom + "translateSPSS2R" # depends on broken car + "TriMatch" # depends on broken package nlopt "TSMySQL" # broken build "tsoutliers" # broken build - "tspair" # broken build - "TSSi" # broken build - "ttScreening" # broken build - "TurboNorm" # depends on broken package affyio-1.37.0 - "tweeDEseq" # broken build - "twilight" # broken build "UBCRM" # broken build - "umx" # depends on broken package r-OpenMx-2.2.6 - "UNDO" # broken build - "unifiedWMWqPCR" # depends on broken package affyio-1.37.0 + "umx" # depends on broken package OpenMx "uniftest" # broken build - "UniProt_ws" # broken build "untb" # broken build - "userfriendlyscience" # depends on broken package nlopt-2.4.2 + "userfriendlyscience" # depends on broken package nlopt "V8" # build is broken - "VanillaICE" # depends on broken package affyio-1.37.0 - "varComp" # depends on broken package r-lme4-1.1-9 + "varComp" # depends on broken package lme4 "varian" # build is broken - "variancePartition" # depends on broken package lme4-1.1-8 - "VariantAnnotation" # depends on broken package Rsamtools-1.21.8 - "VariantFiltering" # depends on broken package Rsamtools-1.21.8 - "VariantTools" # depends on broken package Rsamtools-1.21.8 + "variancePartition" # depends on broken package lme4 "VBmix" # broken build - "VegaMC" # broken build - "VIM" # depends on broken package nlopt-2.4.2 - "VIMGUI" # depends on broken package nlopt-2.4.2 - "viper" # broken build - "vmsbase" # depends on broken package PBSmapping-2.69.76 - "vows" # depends on broken package nlopt-2.4.2 - "vsn" # depends on broken package affyio-1.37.0 - "vtpnet" # depends on broken package interactiveDisplayBase-1.7.0 - "wateRmelon" # depends on broken package affyio-1.37.0 - "wavClusteR" # depends on broken package Rsamtools-1.21.8 - "waveTiling" # depends on broken package affyio-1.37.0 - "webbioc" # depends on broken package affyio-1.37.0 + "VIM" # depends on broken package nlopt + "VIMGUI" # depends on broken package nlopt + "vows" # depends on broken package nlopt "webp" # build is broken - "wfe" # depends on broken package nlopt-2.4.2 - "WGCNA" # build is broken - "wgsea" # depends on broken package snpStats-1.19.0 - "wikipediatrend" # broken build - "wordbankr" # depends on broken package r-RMySQL-0.10.7 - "XBSeq" # broken build - "xcms" # depends on broken package mzR-2.3.1 - "XDE" # broken build - "x_ent" # broken build - "xergm" # depends on broken package nlopt-2.4.2 + "wfe" # depends on broken package nlopt + "wordbankr" # depends on broken package RMySQL + "xergm" # depends on broken package nlopt "xps" # build is broken - "XVector" # broken build - "yaqcaffy" # depends on broken package affyio-1.37.0 - "yCrypticRNAs" # depends on broken package biomaRt-2.26.1 - "ZeligChoice" # depends on broken package r-AER-1.2-4 - "Zelig" # depends on broken package r-AER-1.2-4 - "ZeligMultilevel" # depends on broken package nlopt-2.4.2 - "zetadiv" # depends on broken package nlopt-2.4.2 - "zoib" + "ZeligChoice" # depends on broken package AER + "Zelig" # depends on broken package AER + "zetadiv" # depends on broken package nlopt + "zoib" # broken build ]; otherOverrides = old: new: { @@ -2311,7 +1809,7 @@ let xml2 = old.xml2.overrideDerivation (attrs: { preConfigure = '' - export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2 + export LIBXML_INCDIR=${pkgs.libxml2.dev}/include/libxml2 patchShebangs configure ''; }); @@ -2383,7 +1881,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index d45401b957de9..4d6a69b27aa0f 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -3,29 +3,45 @@ library(data.table) library(parallel) cl <- makeCluster(10) -mirrorType <- commandArgs(trailingOnly=TRUE)[1] -stopifnot(mirrorType %in% c("bioc","cran", "irkernel")) - -packagesFile <- paste(mirrorType, 'packages.nix', sep='-') -readFormatted <- as.data.table(read.table(skip=8, sep='"', text=head(readLines(packagesFile), -1))) rVersion <- paste(R.Version()$major, strsplit(R.Version()$minor, ".", fixed=TRUE)[[1]][1], sep=".") snapshotDate <- Sys.Date() -mirrorUrls <- list( bioc=paste0("https://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/bioc/src/contrib/") - , cran=paste0("https://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/") - , irkernel="https://irkernel.github.io/src/contrib/" +mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/bioc/src/contrib/") + , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/") + , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/experiment/src/contrib/") + , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/") + , irkernel="http://irkernel.github.io/src/contrib/" ) -mirrorUrl <- mirrorUrls[mirrorType][[1]] + +mirrorType <- commandArgs(trailingOnly=TRUE)[1] +stopifnot(mirrorType %in% names(mirrorUrls)) +packagesFile <- paste(mirrorType, 'packages.nix', sep='-') +readFormatted <- as.data.table(read.table(skip=8, sep='"', text=head(readLines(packagesFile), -1))) + +write(paste("downloading package lists"), stderr()) knownPackages <- lapply(mirrorUrls, function(url) as.data.table(available.packages(url, filters=c("R_version", "OS_type", "duplicates")), method="libcurl")) pkgs <- knownPackages[mirrorType][[1]] setkey(pkgs, Package) knownPackages <- c(unique(do.call("rbind", knownPackages)$Package)) knownPackages <- sapply(knownPackages, gsub, pattern=".", replacement="_", fixed=TRUE) +mirrorUrl <- mirrorUrls[mirrorType][[1]] nixPrefetch <- function(name, version) { prevV <- readFormatted$V2 == name & readFormatted$V4 == version - if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else - system(paste0("nix-prefetch-url --type sha256 ", mirrorUrl, name, "_", version, ".tar.gz"), intern=TRUE) + if (sum(prevV) == 1) + as.character(readFormatted$V6[ prevV ]) + + else { + # avoid nix-prefetch-url because it often fails to fetch/hash large files + url <- paste0(mirrorUrl, name, "_", version, ".tar.gz") + tmp <- tempfile(pattern=paste0(name, "_", version), fileext=".tar.gz") + cmd <- paste0("wget -q -O '", tmp, "' '", url, "'") + cmd <- paste0(cmd, " && nix-hash --type sha256 --base32 --flat '", tmp, "'") + cmd <- paste0(cmd, " && echo >&2 ' added ", name, " v", version, "'") + cmd <- paste0(cmd, " ; rm -rf '", tmp, "'") + system(cmd, intern=TRUE) + } + } formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { @@ -47,9 +63,11 @@ clusterExport(cl, c("nixPrefetch","readFormatted", "mirrorUrl", "knownPackages") pkgs <- as.data.table(available.packages(mirrorUrl, filters=c("R_version", "OS_type", "duplicates"), method="libcurl")) pkgs <- pkgs[order(Package)] -pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2])) +write(paste("updating", mirrorType, "packages"), stderr()) +pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2])) nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6])) +write("done", stderr()) cat("# This file is generated from generate-r-packages.R. DO NOT EDIT.\n") cat("# Execute the following command to update the file.\n") @@ -58,9 +76,9 @@ cat(paste("# Rscript generate-r-packages.R", mirrorType, ">new && mv new", packa cat("\n\n") cat("{ self, derive }:\n") cat("let derive2 = derive ") -if (mirrorType == "bioc") { cat("{ rVersion = \"", rVersion, "\"; }", sep="") -} else if (mirrorType == "cran") { cat("{ snapshot = \"", paste(snapshotDate), "\"; }", sep="") -} else if (mirrorType == "irkernel") { cat("{}") } +if (mirrorType == "cran") { cat("{ snapshot = \"", paste(snapshotDate), "\"; }", sep="") +} else if (mirrorType == "irkernel") { cat("{}") +} else { cat("{ rVersion = \"", rVersion, "\"; }", sep="") } cat(";\n") cat("in with self; {\n") cat(paste(nix, collapse="\n"), "\n", sep="") diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index d5e2154ab3b3e..4ebba0d5b6538 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -10,6 +10,7 @@ , postBuild ? null , document ? [] , meta ? {} +, groups ? ["default"] , ignoreCollisions ? false , ... }@args: @@ -18,14 +19,19 @@ let shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; importedGemset = import gemset; + filteredGemset = (lib.filterAttrs (name: attrs: + if (builtins.hasAttr "groups" attrs) + then (builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups) + else true + ) importedGemset); applyGemConfigs = attrs: (if gemConfig ? "${attrs.gemName}" then attrs // gemConfig."${attrs.gemName}" attrs else attrs); - configuredGemset = lib.flip lib.mapAttrs importedGemset (name: attrs: - applyGemConfigs (attrs // { gemName = name; }) + configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs: + applyGemConfigs (attrs // { inherit ruby; gemName = name; }) ); - hasBundler = builtins.hasAttr "bundler" importedGemset; + hasBundler = builtins.hasAttr "bundler" filteredGemset; bundler = if hasBundler then gems.bundler else defs.bundler.override (attrs: { inherit ruby; }); gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildRubyGem ((removeAttrs attrs ["source"]) // attrs.source // { @@ -40,12 +46,6 @@ let mkdir -p $out cp ${gemfile} $out/Gemfile cp ${lockfile} $out/Gemfile.lock - - cd $out - chmod +w Gemfile.lock - export GEM_PATH=${bundler}/${ruby.gemPath} - ${ruby}/bin/ruby -rubygems -e \ - "require 'bundler'; Bundler.definition.lock('Gemfile.lock')" ''; envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler; bundlerEnv = buildEnv { @@ -58,7 +58,8 @@ let "${confFiles}/Gemfile" \ "$out/${ruby.gemPath}" \ "${bundler}/${ruby.gemPath}" \ - ${shellEscape (toString envPaths)} + ${shellEscape (toString envPaths)} \ + ${shellEscape (toString groups)} '' + lib.optionalString (postBuild != null) postBuild; passthru = rec { inherit ruby bundler meta gems; @@ -72,6 +73,7 @@ let makeWrapper "$i" $out/bin/$(basename "$i") \ --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \ + --set BUNDLE_FROZEN 1 \ --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \ --set GEM_PATH ${bundlerEnv}/${ruby.gemPath} done diff --git a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb index fa77682cfd593..92321d6427dc8 100644 --- a/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb @@ -10,6 +10,7 @@ gemfile = ARGV[1] bundle_path = ARGV[2] bundler_gem_path = ARGV[3] paths = ARGV[4].split +groups = ARGV[5].split # generate binstubs FileUtils.mkdir_p("#{out}/bin") @@ -29,14 +30,16 @@ paths.each do |path| # this file is here to facilitate running it. # -ENV["BUNDLE_GEMFILE"] = "#{gemfile}" -ENV["BUNDLE_PATH"] = "#{bundle_path}" +ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} +ENV["BUNDLE_PATH"] = #{bundle_path.dump} +ENV['BUNDLE_FROZEN'] = '1' -Gem.use_paths("#{bundler_gem_path}", ENV["GEM_PATH"]) +Gem.use_paths(#{bundler_gem_path.dump}, ENV["GEM_PATH"]) -require 'bundler/setup' +require 'bundler' +Bundler.setup(#{groups.map(&:dump).join(', ')}) -load Gem.bin_path(#{name.inspect}, #{exe.inspect}) +load Gem.bin_path(#{name.dump}, #{exe.dump}) EOF FileUtils.chmod("+x", "#{out}/bin/#{exe}") end diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 05be9090c84a3..72e483bc77d32 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt5Full +, libmsgpack, qt48 }: let @@ -30,7 +30,7 @@ in { capybara-webkit = attrs: { - buildInputs = [ qt5Full ]; + buildInputs = [ qt48 ]; }; charlock_holmes = attrs: { @@ -76,8 +76,8 @@ in ncursesw = attrs: { buildInputs = [ ncurses ]; buildFlags = [ - "--with-cflags=-I${ncurses}/include" - "--with-ldflags=-L${ncurses}/lib" + "--with-cflags=-I${ncurses.dev}/include" + "--with-ldflags=-L${ncurses.out}/lib" ]; }; @@ -85,12 +85,12 @@ in buildFlags = [ "--use-system-libraries" "--with-zlib-dir=${zlib}" - "--with-xml2-lib=${libxml2}/lib" - "--with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-lib=${libxslt}/lib" - "--with-xslt-include=${libxslt}/include" - "--with-exslt-lib=${libxslt}/lib" - "--with-exslt-include=${libxslt}/include" + "--with-xml2-lib=${libxml2.out}/lib" + "--with-xml2-include=${libxml2.dev}/include/libxml2" + "--with-xslt-lib=${libxslt.out}/lib" + "--with-xslt-include=${libxslt.dev}/include" + "--with-exslt-lib=${libxslt.out}/lib" + "--with-exslt-include=${libxslt.dev}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; @@ -118,8 +118,8 @@ in sqlite3 = attrs: { buildFlags = [ - "--with-sqlite3-include=${sqlite}/include" - "--with-sqlite3-lib=${sqlite}/lib" + "--with-sqlite3-include=${sqlite.dev}/include" + "--with-sqlite3-lib=${sqlite.out}/lib" ]; }; @@ -166,5 +166,15 @@ in export XAPIAN_CONFIG=${xapian}/bin/xapian-config ''; }; + + # patching shebangs would fail on the templates/Executable file, so we + # temporarily remove the executable flag. + bundler = attrs: + let + templates = "${attrs.ruby.gemPath}/gems/${attrs.gemName}-${attrs.version}/lib/bundler/templates/"; + in { + preFixup = "chmod -x $out/${templates}/Executable"; + postFixup = "chmod +x $out/${templates}/Executable"; + }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index e89d8c113a160..b20662c889ab5 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,24 +2,26 @@ let pname = "cppcheck"; - version = "1.72"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.73"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l"; + sha256 = "0l7yslf311h3kidi91q4zhqj3f3vsjp1gb2z50y20423fda87xin"; }; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; + outputs = [ "out" "man" ]; + postInstall = '' make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man - mkdir -p $out/share/man/man1 - cp cppcheck.1 $out/share/man/man1/cppcheck.1 + mkdir -p $man/share/man/man1 + cp cppcheck.1 $man/share/man/man1/cppcheck.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index 4a779cc456e95..c01ba2b53860e 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation { mkdir -p "$out" ./install.sh "--prefix=$out" '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ + patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \ "$out/bin/cargo" '' else "") + postInstall; } diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 60a941a66375f..6542c9ae3c52a 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -47,8 +47,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" + (concatMap (p: [ p p.out ]) buildInputs); + configureFlags = "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + stdenv.lib.optionalString useQt4 " --qt-gui"; @@ -57,11 +58,14 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - preConfigure = optionalString (stdenv ? glibc) + preConfigure = with stdenv; optionalString (stdenv ? glibc) '' source $setupHook fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + substituteInPlace Modules/Platform/UnixPaths.cmake \ + --subst-var-by glibc_bin ${glibc.bin or glibc} \ + --subst-var-by glibc_dev ${glibc.dev or glibc} \ + --subst-var-by glibc_lib ${glibc.out or glibc} ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c8ed91b96fb0d..9d0ff6e1f1746 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib , useNcurses ? false, ncurses, useQt4 ? false, qt4 , wantPS ? false, ps ? null @@ -25,26 +25,34 @@ stdenv.mkDerivation rec { sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp"; }; - enableParallelBuilding = true; - patches = # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path-3.2.patch ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; + outputs = [ "out" "doc" ]; + setOutputFlags = false; + + setupHook = ./setup-hook.sh; + buildInputs = - [ bzip2 curl expat libarchive xz zlib ] + [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; propagatedBuildInputs = optional wantPS ps; - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - + preConfigure = with stdenv; optionalString (stdenv ? glibc) + '' + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake \ + --subst-var-by glibc_bin ${glibc.bin or glibc} \ + --subst-var-by glibc_dev ${glibc.dev or glibc} \ + --subst-var-by glibc_lib ${glibc.out or glibc} + ''; configureFlags = [ "--docdir=/share/doc/${name}" - "--mandir=/share/man" "--no-system-jsoncpp" ] ++ optional (!stdenv.isCygwin) "--system-libs" @@ -52,22 +60,18 @@ stdenv.mkDerivation rec { ++ ["--"] ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; - setupHook = ./setup-hook.sh; - dontUseCmakeConfigure = true; - preConfigure = optionalString (stdenv ? glibc) - '' - source $setupHook - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc ${stdenv.glibc} - ''; + enableParallelBuilding = true; + + preInstall = ''mkdir "$doc" ''; + + postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ]; + platforms = if useQt4 then qt4.meta.platforms else platforms.all; + maintainers = with maintainers; [ urkud mornfall ttuegel ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index b0447e7060712..b61982efb9a7c 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -1,31 +1,20 @@ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 20ee1d1..39834e6 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,64 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) +diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake +--- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300 ++++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300 +@@ -32,9 +32,6 @@ + # List common installation prefixes. These will be used for all # search types. list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard +- # Standard - /usr/local /usr / - -- # CMake install location -- "${_CMAKE_INSTALL_DIR}" -- ) --if (NOT CMAKE_FIND_NO_INSTALL_PREFIX) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Project install destination. -- "${CMAKE_INSTALL_PREFIX}" -- ) -- if(CMAKE_STAGING_PREFIX) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # User-supplied staging prefix. -- "${CMAKE_STAGING_PREFIX}" -- ) -- endif() --endif() -- --# List common include file locations not under the common prefixes. --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH + # CMake install location + "${_CMAKE_INSTALL_DIR}" + ) +@@ -53,44 +50,25 @@ + + # List common include file locations not under the common prefixes. + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH - # Windows API on Cygwin - /usr/include/w32api - @@ -36,9 +25,10 @@ index 20ee1d1..39834e6 100644 - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -- ) ++ @glibc_dev@/include + ) - --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH - # Windows API on Cygwin - /usr/lib/w32api - @@ -49,26 +39,26 @@ index 20ee1d1..39834e6 100644 - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -- ) -- --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH ++ @glibc_lib@/lib + ) + + list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ "@glibc@" ++ @glibc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc@/lib" ++ @glibc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" ++ @glibc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" ++ @glibc_dev@/include ) # Enable use of lib64 search path variants by default. - diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 31c85d6f5220e..6d6ca74ccadc6 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -1,8 +1,7 @@ -diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake -index fe8e003..378512c 100644 ---- a/Modules/Platform/Linux.cmake -+++ b/Modules/Platform/Linux.cmake -@@ -36,13 +36,13 @@ else() +diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake +--- cmake-2.8.12.2/Modules/Platform/Linux.cmake 2014-01-16 21:15:08.000000000 +0400 ++++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake 2016-04-13 22:00:32.928575740 +0300 +@@ -36,22 +36,11 @@ # checking the platform every time. This option is advanced enough # that only package maintainers should need to adjust it. They are # capable of providing a setting on the command line. @@ -10,46 +9,40 @@ index fe8e003..378512c 100644 - set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - "Install .so files without execute permission.") - else() -+ # if(EXISTS "/etc/debian_version") -+ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -+ # "Install .so files without execute permission.") -+ # else() - set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL - "Install .so files without execute permission.") +- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL +- "Install .so files without execute permission.") - endif() -+ # endif() ++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL ++ "Install .so files without execute permission.") endif() # Match multiarch library directory names. -@@ -52,6 +52,6 @@ include(Platform/UnixPaths) + set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") - # Debian has lib64 paths only for compatibility so they should not be - # searched. + include(Platform/UnixPaths) +- +-# Debian has lib64 paths only for compatibility so they should not be +-# searched. -if(EXISTS "/etc/debian_version") - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -endif() -+# if(EXISTS "/etc/debian_version") -+# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -+#endif() -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index ccb2663..39834e6 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) +diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake +--- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake 2014-01-16 21:15:08.000000000 +0400 ++++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:09:10.106362636 +0300 +@@ -32,9 +32,6 @@ + # List common installation prefixes. These will be used for all # search types. list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard +- # Standard - /usr/local /usr / - -- # CMake install location -- "${_CMAKE_INSTALL_DIR}" -- -- # Project install destination. -- "${CMAKE_INSTALL_PREFIX}" -- ) -- --# List common include file locations not under the common prefixes. --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH + # CMake install location + "${_CMAKE_INSTALL_DIR}" + +@@ -44,44 +41,26 @@ + + # List common include file locations not under the common prefixes. + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH - # Windows API on Cygwin - /usr/include/w32api - @@ -60,9 +53,10 @@ index ccb2663..39834e6 100644 - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -- ) -- --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ++ @glibc_dev@/include + ) + + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH - # Windows API on Cygwin - /usr/lib/w32api - @@ -73,25 +67,26 @@ index ccb2663..39834e6 100644 - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -- ) -- --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH ++ @glibc_lib@/lib + ) + + list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ "@glibc@" ++ @glibc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc@/lib" ++ @glibc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" ++ @glibc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" ++ @glibc_dev@/include ) # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 670376efdcab8..b14e9984bc3c4 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -13,7 +13,7 @@ fixCmakeFiles() { } cmakeConfigurePhase() { - eval "$preConfigure" + runHook preConfigure if [ -z "$dontFixCmake" ]; then fixCmakeFiles . @@ -53,10 +53,11 @@ cmakeConfigurePhase() { cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}" - eval "$postConfigure" + runHook postConfigure } if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then + setOutputFlags= configurePhase=cmakeConfigurePhase fi diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix index 9ac2010701828..de6f96ce99f6c 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { ./no-tty-name.patch ]; + outputs = [ "out" "doc" ]; + meta = { homepage = http://www.gnu.org/software/make/; description = "A tool to control the generation of non-source files from sources"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 96477e55d26ae..730d42073759a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -22,7 +22,7 @@ rec { mkdir patching pushd patching jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.10.jar - patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so jar cf native-platform-linux-${arch}-0.10.jar . mv native-platform-linux-${arch}-0.10.jar $out/lib/gradle/lib/ popd diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix index 7f5caf7e64862..a9af037bb81e8 100644 --- a/pkgs/development/tools/build-managers/gup/build.nix +++ b/pkgs/development/tools/build-managers/gup/build.nix @@ -1,5 +1,5 @@ # NOTE: this file is copied from the upstream repository for this package. -# Please submit any changes you make here to https://github.com/gfxmonk/gup/ +# Please submit any changes you make here to https://github.com/timbertson/gup/ { stdenv, lib, python, which, pychecker ? null }: { src, version, meta ? {} }: diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index a907e6ace9e42..8e85c63cb6e59 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchgit, lib, python, which }: +{ stdenv, fetchFromGitHub, lib, python, which }: let - version = "0.5.4"; - src = fetchgit { - url = "https://github.com/gfxmonk/gup.git"; - rev = "b3980e529c860167b48e31634d2b479fc4d10274"; - sha256 = "bb02ba0a7f1680ed5b9a8e8c9cc42aa07016329840f397d914b94744f9ed7c85"; + version = "0.5.5"; + src = fetchFromGitHub { + sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q"; + rev = "version-${version}"; + repo = "gup"; + owner = "timbertson"; }; in import ./build.nix { inherit stdenv lib python which; } { inherit src version; meta = { + inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; - homepage = https://github.com/gfxmonk/gup; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.gfxmonk ]; + maintainers = [ stdenv.lib.maintainers.timbertson ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 37035b8c44d3b..417ab348c4052 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.4.1"; + version = "2.5.0"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "19skywi4sb8riivvrylkjrjhnw1cdxj4ps8v7srwp6y650lz9i4g"; + sha256 = "1sdcj8iapfzmlq7098yas40qwl6khsiwydbxv33sw81wy93nnagb"; }; buildInputs = [python makeWrapper]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index f3db234cd9691..bcad521ed5234 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -9,12 +9,15 @@ pythonPackages.buildPythonApplication rec { md5= "bfc8cd768f983fd0585c347bca00c8bb"; }; - buildInputs = [ pythonPackages.tox pythonPackages.check-manifest pythonPackages.devpi-common pythonPackages.pkginfo ]; + buildInputs = [ pythonPackages.tox pythonPackages.check-manifest pythonPackages.pkginfo ]; + + propagatedBuildInputs = [ pythonPackages.py pythonPackages.devpi-common ]; + meta = { homepage = http://doc.devpi.net; description = "Github-style pypi index server and packaging meta tool"; license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.lewo]; + maintainers = with stdenv.lib.maintainers; [ lewo makefu ]; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 0b16723866bfa..7373d8584c234 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "doxygen-1.8.11"; - + src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35"; }; nativeBuildInputs = [ cmake ]; - + buildInputs = [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4 @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cmakeFlags = + [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index bb70b1ad3641e..b080be846cd99 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; + outputDocdev = "out"; + # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" preConfigure = '' diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index aae4b413c3d95..d7d338f7f60e3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip -, systemd, libnotify -, version ? "0.36.2", sha256 ? "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d", ... -}: +{ stdenv, callPackage, fetchurl, unzip +, ... +} @ args: + let - atomEnv = buildEnv { - name = "env-atom"; - paths = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 - fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify - ]; - }; + atomEnv = callPackage ./env-atom.nix (args); in stdenv.mkDerivation rec { name = "electron-${version}"; - inherit version; + version = "0.36.2"; src = fetchurl { url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - inherit sha256; + sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d"; name = "${name}.zip"; }; diff --git a/pkgs/development/tools/electron/env-atom.nix b/pkgs/development/tools/electron/env-atom.nix new file mode 100644 index 0000000000000..6c69b2e52ccb9 --- /dev/null +++ b/pkgs/development/tools/electron/env-atom.nix @@ -0,0 +1,17 @@ +{ stdenv, buildEnv, zlib, glib, alsaLib +, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap +, systemd, libnotify +, ... +}: + +buildEnv { + name = "env-atom"; + paths = [ + stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd libnotify + ]; +} diff --git a/pkgs/development/tools/haskell/haste/haste-Cabal.nix b/pkgs/development/tools/haskell/haste/haste-Cabal.nix new file mode 100644 index 0000000000000..45a60172e3952 --- /dev/null +++ b/pkgs/development/tools/haskell/haste/haste-Cabal.nix @@ -0,0 +1,35 @@ +# Haste requires its own patched up version of Cabal that's not on hackage +{ mkDerivation, array, base, binary, bytestring, containers +, deepseq, directory, extensible-exceptions, filepath, old-time +, pretty, process, QuickCheck, regex-posix, stdenv, tasty +, tasty-hunit, tasty-quickcheck, time, unix +, fetchFromGitHub +}: + +mkDerivation { + pname = "Cabal"; + version = "1.23.0.0"; + src = fetchFromGitHub { + owner = "valderman"; + repo = "cabal"; + rev = "a1962987ba32d5e20090830f50c6afdc78dae005"; + sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh"; + }; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + old-time pretty process QuickCheck regex-posix tasty tasty-hunit + tasty-quickcheck unix + ]; + prePatch = '' + rm -rf cabal-install + cd Cabal + ''; + doCheck = false; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix b/pkgs/development/tools/haskell/haste/haste-cabal-install.nix new file mode 100644 index 0000000000000..dd140409173e6 --- /dev/null +++ b/pkgs/development/tools/haskell/haste/haste-cabal-install.nix @@ -0,0 +1,46 @@ +# Haste requires its own patched up version of cabal-install that's not on hackage +{ mkDerivation, array, base, bytestring, Cabal, containers +, directory, extensible-exceptions, filepath, HTTP, mtl, network +, network-uri, pretty, process, QuickCheck, random, regex-posix +, stdenv, stm, tagged, tasty, tasty-hunit, tasty-quickcheck, time +, unix, zlib +, fetchFromGitHub +}: + +mkDerivation { + pname = "cabal-install"; + version = "1.23.0.0"; + src = fetchFromGitHub { + owner = "valderman"; + repo = "cabal"; + rev = "a1962987ba32d5e20090830f50c6afdc78dae005"; + sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring Cabal containers directory filepath HTTP mtl + network network-uri pretty process random stm time unix zlib + ]; + testHaskellDepends = [ + array base bytestring Cabal containers directory + extensible-exceptions filepath HTTP mtl network network-uri pretty + process QuickCheck random regex-posix stm tagged tasty tasty-hunit + tasty-quickcheck time unix zlib + ]; + prePatch = '' + rm -rf Cabal + cd cabal-install + ''; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + + # Manually added by Nix maintainer + mv -v $out/etc/bash_completion.d/cabal $out/etc/bash_completion.d/haste-cabal + ''; + doCheck = false; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/haste/haste-compiler.nix b/pkgs/development/tools/haskell/haste/haste-compiler.nix new file mode 100644 index 0000000000000..f9aa5abae5741 --- /dev/null +++ b/pkgs/development/tools/haskell/haste/haste-compiler.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, overrideCabal +, super-haste-compiler +}: + +overrideCabal super-haste-compiler (drv: { + configureFlags = [ "-f-portable" ]; + prePatch = '' + # Get ghc libdir by invoking ghc and point to haste-cabal binary + substituteInPlace src/Haste/Environment.hs \ + --replace \ + 'hasteGhcLibDir = hasteSysDir' \ + 'hasteGhcLibDir = head $ lines $ either (error . show) id $ unsafePerformIO $ shell $ run "ghc" ["--print-libdir"] ""' \ + --replace \ + 'hasteCabalBinary = hasteBinDir </> "haste-cabal" ++ binaryExt' \ + 'hasteCabalBinary = "haste-cabal" ++ binaryExt' + + # Don't try to download/install haste-cabal in haste-boot: + patch src/haste-boot.hs << EOF + @@ -178,10 +178,6 @@ + pkgSysLibDir, jsmodSysDir, pkgSysDir] + + mkdir True (hasteCabalRootDir portableHaste) + - case getHasteCabal cfg of + - Download -> installHasteCabal portableHaste tmpdir + - Prebuilt fp -> copyHasteCabal portableHaste fp + - Source mdir -> buildHasteCabal portableHaste (maybe "../cabal" id mdir) + + -- Spawn off closure download in the background. + dir <- pwd -- use absolute path for closure to avoid dir changing race + EOF + ''; +}) diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 01dfe339d141b..85d4bfc93b6ae 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -14,14 +14,14 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac inherit haskellPackages; packages = allPkgs; }; - bins = lib.makeSearchPath "bin" ([ mueval' - (haskellPackages.ghcWithPackages allPkgs) - haskellPackages.unlambda - haskellPackages.brainfuck - ] - ++ lib.optional withDjinn haskellPackages.djinn - ++ lib.optional (aspell != null) aspell - ); + bins = lib.makeBinPath ([ mueval' + (haskellPackages.ghcWithPackages allPkgs) + haskellPackages.unlambda + haskellPackages.brainfuck + ] + ++ lib.optional withDjinn haskellPackages.djinn + ++ lib.optional (aspell != null) aspell + ); modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index bba50b3208920..d2ddcabc0b1eb 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs"; }; + outputs = [ "dev" "bin" "lib" "out" "man" "info" ]; + nativeBuildInputs = [ which pkgconfig perl ]; buildInputs = [ guile libxml2 ]; @@ -20,6 +22,17 @@ stdenv.mkDerivation rec { substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR ''; + postInstall = '' + mkdir -p $dev/bin + mv $bin/bin/autoopts-config $dev/bin + + for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do + sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f + sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f + sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f + done + ''; + #doCheck = true; # 2 tests fail because of missing /dev/tty meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9992e2f6e0597..0d13e7c978cf9 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ./fix-update-symbol-version.patch ]; - outputs = [ "out" "info" ]; + outputs = (optional (cross == null) "dev") ++ [ "out" "info" ]; nativeBuildInputs = [ bison ]; buildInputs = [ zlib ]; @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postFixup = optionalString (cross == null) "ln -s $out/bin $dev/bin"; # tools needed for development + meta = with stdenv.lib; { description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch new file mode 100644 index 0000000000000..bb0785fe192ec --- /dev/null +++ b/pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch @@ -0,0 +1,1786 @@ +--- binutils-2.23/bfd/elf-bfd.h ++++ binutils-2.23/bfd/elf-bfd.h +@@ -1577,6 +1577,9 @@ struct elf_obj_tdata + /* Segment flags for the PT_GNU_STACK segment. */ + unsigned int stack_flags; + ++ /* Segment flags for the PT_PAX_FLAGS segment. */ ++ unsigned int pax_flags; ++ + /* Symbol version definitions in external objects. */ + Elf_Internal_Verdef *verdef; + +--- binutils-2.23/bfd/elf.c ++++ binutils-2.23/bfd/elf.c +@@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type) + case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; + case PT_GNU_STACK: pt = "STACK"; break; + case PT_GNU_RELRO: pt = "RELRO"; break; ++ case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; + default: pt = NULL; break; + } + return pt; +@@ -2477,6 +2478,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index) + case PT_GNU_RELRO: + return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro"); + ++ case PT_PAX_FLAGS: ++ return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags"); ++ + default: + /* Check for any processor-specific program segment types. */ + bed = get_elf_backend_data (abfd); +@@ -3551,6 +3555,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info) + ++segs; + } + ++ { ++ /* We need a PT_PAX_FLAGS segment. */ ++ ++segs; ++ } ++ + for (s = abfd->sections; s != NULL; s = s->next) + { + if ((s->flags & SEC_LOAD) != 0 +@@ -4153,6 +4162,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) + } + } + ++ { ++ amt = sizeof (struct elf_segment_map); ++ m = bfd_zalloc (abfd, amt); ++ if (m == NULL) ++ goto error_return; ++ m->next = NULL; ++ m->p_type = PT_PAX_FLAGS; ++ m->p_flags = elf_tdata (abfd)->pax_flags; ++ m->p_flags_valid = 1; ++ ++ *pm = m; ++ pm = &m->next; ++ } ++ + free (sections); + elf_tdata (abfd)->segment_map = mfirst; + } +@@ -5417,7 +5440,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + 6. PT_TLS segment includes only SHF_TLS sections. + 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. + 8. PT_DYNAMIC should not contain empty sections at the beginning +- (with the possible exception of .dynamic). */ ++ (with the possible exception of .dynamic). ++ 9. PT_PAX_FLAGS segments do not include any sections. */ + #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ + ((((segment->p_paddr \ + ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr) \ +@@ -5425,6 +5449,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + && (section->flags & SEC_ALLOC) != 0) \ + || IS_NOTE (segment, section)) \ + && segment->p_type != PT_GNU_STACK \ ++ && segment->p_type != PT_PAX_FLAGS \ + && (segment->p_type != PT_TLS \ + || (section->flags & SEC_THREAD_LOCAL)) \ + && (segment->p_type == PT_LOAD \ +--- binutils-2.23/bfd/elflink.c ++++ binutils-2.23/bfd/elflink.c +@@ -5545,16 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, + return TRUE; + + bed = get_elf_backend_data (output_bfd); ++ ++ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC; ++ if (info->execheap) ++ elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT; ++ else if (info->noexecheap) ++ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT; ++ + if (info->execstack) +- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; ++ { ++ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; ++ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; ++ } + else if (info->noexecstack) +- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; ++ { ++ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; ++ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; ++ } + else + { + bfd *inputobj; + asection *notesec = NULL; + int exec = 0; + ++ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; + for (inputobj = info->input_bfds; + inputobj; + inputobj = inputobj->link_next) +@@ -5567,7 +5581,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, + if (s) + { + if (s->flags & SEC_CODE) +- exec = PF_X; ++ { ++ elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP; ++ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; ++ exec = PF_X; ++ } + notesec = s; + } + else if (bed->default_execstack) +--- binutils-2.23/binutils/readelf.c ++++ binutils-2.23/binutils/readelf.c +@@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type) + return "GNU_EH_FRAME"; + case PT_GNU_STACK: return "GNU_STACK"; + case PT_GNU_RELRO: return "GNU_RELRO"; ++ case PT_PAX_FLAGS: return "PAX_FLAGS"; + + default: + if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) +--- binutils-2.23/include/bfdlink.h ++++ binutils-2.23/include/bfdlink.h +@@ -322,6 +322,14 @@ struct bfd_link_info + /* TRUE if PT_GNU_RELRO segment should be created. */ + unsigned int relro: 1; + ++ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT ++ flags. */ ++ unsigned int execheap: 1; ++ ++ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT ++ flags. */ ++ unsigned int noexecheap: 1; ++ + /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment + should be created. */ + unsigned int eh_frame_hdr: 1; +--- binutils-2.23/include/elf/common.h ++++ binutils-2.23/include/elf/common.h +@@ -429,6 +429,7 @@ + #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */ + #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */ + #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */ ++#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ + + /* Program segment permissions, in program header p_flags field. */ + +@@ -439,6 +440,21 @@ + #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ + #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ + ++/* Flags to control PaX behavior. */ ++ ++#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ ++#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ ++#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ ++#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ ++#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ ++#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ ++#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ ++#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ ++#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ ++#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ ++#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ ++#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ ++ + /* Values for section header, sh_type field. */ + + #define SHT_NULL 0 /* Section header table entry unused */ +--- binutils-2.23/ld/emultempl/elf32.em ++++ binutils-2.23/ld/emultempl/elf32.em +@@ -2285,6 +2285,16 @@ fragment <<EOF + link_info.noexecstack = TRUE; + link_info.execstack = FALSE; + } ++ else if (strcmp (optarg, "execheap") == 0) ++ { ++ link_info.execheap = TRUE; ++ link_info.noexecheap = FALSE; ++ } ++ else if (strcmp (optarg, "noexecheap") == 0) ++ { ++ link_info.noexecheap = TRUE; ++ link_info.execheap = FALSE; ++ } + EOF + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then + fragment <<EOF +@@ -2368,6 +2378,8 @@ fragment <<EOF + -z defs Report unresolved symbols in object files.\n")); + fprintf (file, _("\ + -z execstack Mark executable as requiring executable stack\n")); ++ fprintf (file, _("\ ++ -z execheap Mark executable as requiring executable heap\n")); + EOF + + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then +@@ -2391,6 +2403,8 @@ fragment <<EOF + fragment <<EOF + fprintf (file, _("\ + -z noexecstack Mark executable as not requiring executable stack\n")); ++ fprintf (file, _("\ ++ -z noexecheap Mark executable as not requiring executable heap\n")); + EOF + if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then + fragment <<EOF +--- binutils-2.23/ld/ldgram.y ++++ binutils-2.23/ld/ldgram.y +@@ -1119,6 +1119,8 @@ phdr_type: + $$ = exp_intop (0x6474e550); + else if (strcmp (s, "PT_GNU_STACK") == 0) + $$ = exp_intop (0x6474e551); ++ else if (strcmp (s, "PT_PAX_FLAGS") == 0) ++ $$ = exp_intop (0x65041580); + else + { + einfo (_("\ +--- binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd ++++ binutils-2.23/ld/testsuite/ld-alpha/tlsbin.rd +@@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8 ++ PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+188 R E 0x8 + INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 + .*Requesting program interpreter.* + LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000 + LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries: +--- binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd ++++ binutils-2.23/ld/testsuite/ld-alpha/tlsbinr.rd +@@ -42,6 +42,7 @@ Program Headers: + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: +--- binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd ++++ binutils-2.23/ld/testsuite/ld-alpha/tlspic.rd +@@ -38,6 +38,7 @@ Program Headers: + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000 + +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8 + +TLS +0x0+10e0 0x0+110e0 0x0+110e0 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries: +--- binutils-2.23/ld/testsuite/ld-elf/eh1.d ++++ binutils-2.23/ld/testsuite/ld-elf/eh1.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 +- DW_CFA_advance_loc: 0 to 00400078 ++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 \(rbp\) at cfa-16 +- DW_CFA_advance_loc: 0 to 00400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 \(rbp\) + + 00000038 ZERO terminator +--- binutils-2.23/ld/testsuite/ld-elf/eh2.d ++++ binutils-2.23/ld/testsuite/ld-elf/eh2.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 +- DW_CFA_advance_loc: 0 to 00400078 ++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 \(rbp\) at cfa-16 +- DW_CFA_advance_loc: 0 to 00400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 \(rbp\) + + 00000038 ZERO terminator +--- binutils-2.23/ld/testsuite/ld-elf/eh3.d ++++ binutils-2.23/ld/testsuite/ld-elf/eh3.d +@@ -22,11 +22,11 @@ Contents of the .eh_frame section: + DW_CFA_nop + DW_CFA_nop + +-00000018 0000001c 0000001c FDE cie=00000000 pc=00400078..00400078 +- DW_CFA_advance_loc: 0 to 00400078 ++00000018 0000001c 0000001c FDE cie=00000000 pc=([0-9a-f]+)..\1 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_offset: 16 + DW_CFA_offset: r6 \(rbp\) at cfa-16 +- DW_CFA_advance_loc: 0 to 00400078 ++ DW_CFA_advance_loc: 0 to [0-9a-f]+ + DW_CFA_def_cfa_register: r6 \(rbp\) + + 00000038 ZERO terminator +--- binutils-2.23/ld/testsuite/ld-elf/orphan-region.d ++++ binutils-2.23/ld/testsuite/ld-elf/orphan-region.d +@@ -15,7 +15,9 @@ + Program Headers: + Type.* + LOAD[ \t]+0x[0-9a-f]+ 0x0*40000000 0x0*40000000 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x[0-9a-f]+ ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + Segment Sections... + 00 .text .rodata .moredata * ++ 01 + +--- binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlsbin.rd +@@ -44,6 +44,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -53,6 +54,7 @@ Program Headers: + +03 +.tdata .dynamic .got .got.plt * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlsbindesc.rd +@@ -42,6 +42,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -51,6 +52,7 @@ Program Headers: + +03 +.tdata .dynamic .got .got.plt * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlsdesc.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlsgdesc.rd +@@ -36,12 +36,14 @@ Program Headers: + +LOAD.* + +LOAD.* + +DYNAMIC.* ++ +PAX_FLAGS.* + + Section to Segment mapping: + +Segment Sections... + +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text * + +01 +.dynamic .got .got.plt * + +02 +.dynamic * ++ +03 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlsnopic.rd +@@ -37,6 +37,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -44,6 +45,7 @@ Program Headers: + +01 +.dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-i386/tlspic.rd ++++ binutils-2.23/ld/testsuite/ld-i386/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -47,6 +48,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries: + Offset +Info +Type +Sym.Value +Sym. Name +--- binutils-2.23/ld/testsuite/ld-ia64/merge1.d ++++ binutils-2.23/ld/testsuite/ld-ia64/merge1.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+1e0 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.23/ld/testsuite/ld-ia64/merge2.d ++++ binutils-2.23/ld/testsuite/ld-ia64/merge2.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+1e0 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 c0 04 00 48 00 addl r12=24,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.23/ld/testsuite/ld-ia64/merge3.d ++++ binutils-2.23/ld/testsuite/ld-ia64/merge3.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+210 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.23/ld/testsuite/ld-ia64/merge4.d ++++ binutils-2.23/ld/testsuite/ld-ia64/merge4.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+240 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.23/ld/testsuite/ld-ia64/merge5.d ++++ binutils-2.23/ld/testsuite/ld-ia64/merge5.d +@@ -4,7 +4,7 @@ + #objdump: -d + + #... +-0+270 <.text>: ++[a-f0-9]+ <.text>: + [ ]*[a-f0-9]+: 0b 60 80 02 00 24 \[MMI\] addl r12=32,r1;; + [ ]*[a-f0-9]+: c0 40 05 00 48 00 addl r12=40,r1 + [ ]*[a-f0-9]+: 00 00 04 00 nop.i 0x0;; +--- binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd ++++ binutils-2.23/ld/testsuite/ld-ia64/tlsbin.rd +@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- +PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8 +- +INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 ++ +PHDR +0x0+40 0x40+40 0x40+40 (0x[0-9a-f]+) \1 R E 0x8 ++ +INTERP +0x0+([0-9a-f]+) (0x40+\1) \2 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1 + .*Requesting program interpreter.* + +LOAD +0x0+ 0x40+ 0x40+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ R E 0x10000 + +LOAD +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 + +DYNAMIC +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+150 0x0+150 RW +0x8 + +TLS +0x0+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x60+1[0-9a-f]+ 0x0+60 0x0+a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + +IA_64_UNWIND .* R +0x8 + #... + +--- binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd ++++ binutils-2.23/ld/testsuite/ld-ia64/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000 + +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8 + +TLS +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8 + #... + +--- binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d ++++ binutils-2.23/ld/testsuite/ld-mips-elf/multi-got-no-shared.d +@@ -8,9 +8,9 @@ + .*: +file format.* + + Disassembly of section \.text: +-004000b0 <[^>]*> 3c1c0043 lui gp,0x43 +-004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 +-004000b8 <[^>]*> afbc0008 sw gp,8\(sp\) ++004000d0 <[^>]*> 3c1c0043 lui gp,0x43 ++004000d4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 ++004000d8 <[^>]*> afbc0008 sw gp,8\(sp\) + #... + 00408d60 <[^>]*> 3c1c0043 lui gp,0x43 + 00408d64 <[^>]*> 279c2c98 addiu gp,gp,11416 +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd +@@ -1,7 +1,7 @@ + + Elf file type is DYN \(Shared object file\) + Entry point .* +-There are 5 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -9,6 +9,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.* + * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -18,3 +19,4 @@ Program Headers: + *0*2 * \.data \.got * + *0*3 * \.dynamic * + *0*4 * ++ *0*5 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 *\.got \.data * + *0*6 *\.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * \.got \.data \.bss * + *0*6 * \.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * \.got \.data \.bss * + *0*6 * \.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * \.got \.data \.bss * + *0*6 * \.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 7 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -12,6 +12,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -23,3 +24,4 @@ Program Headers: + *0*4 * \.got \.data \.bss * + *0*5 * \.dynamic * + *0*6 * ++ *0*7 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd ++++ binutils-2.23/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd +@@ -1,7 +1,7 @@ + + Elf file type is EXEC \(Executable file\) + Entry point 0x44000 +-There are 8 program headers, starting at offset .* ++There are [0-9] program headers, starting at offset .* + + Program Headers: + * Type * Offset * VirtAddr * PhysAddr * FileSiz * MemSiz * Flg * Align +@@ -13,6 +13,7 @@ Program Headers: + * LOAD * [^ ]+ * 0x0+80000 * 0x0+80000 [^ ]+ * [^ ]+ * RW * 0x.* + * LOAD * [^ ]+ * 0x0+a0000 * 0x0+a0000 [^ ]+ * [^ ]+ * RW * 0x.* + * DYNAMIC * [^ ]+ * 0x0+42000 * 0x0+42000 .* ++ * PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + * NULL * .* + + *Section to Segment mapping: +@@ -25,3 +26,4 @@ Program Headers: + *0*5 * \.got \.data \.bss * + *0*6 * \.dynamic * + *0*7 * ++ *0*8 * +--- binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d ++++ binutils-2.23/ld/testsuite/ld-mips-elf/tlsbin-o32.d +@@ -2,42 +2,42 @@ + + Disassembly of section .text: + +-004000d0 <__start>: +- 4000d0: 3c1c0fc0 lui gp,0xfc0 +- 4000d4: 279c7f30 addiu gp,gp,32560 +- 4000d8: 0399e021 addu gp,gp,t9 +- 4000dc: 27bdfff0 addiu sp,sp,-16 +- 4000e0: afbe0008 sw s8,8\(sp\) +- 4000e4: 03a0f021 move s8,sp +- 4000e8: afbc0000 sw gp,0\(sp\) +- 4000ec: 8f998018 lw t9,-32744\(gp\) +- 4000f0: 27848028 addiu a0,gp,-32728 +- 4000f4: 0320f809 jalr t9 +- 4000f8: 00000000 nop +- 4000fc: 8fdc0000 lw gp,0\(s8\) +- 400100: 00000000 nop +- 400104: 8f998018 lw t9,-32744\(gp\) +- 400108: 27848020 addiu a0,gp,-32736 +- 40010c: 0320f809 jalr t9 +- 400110: 00000000 nop +- 400114: 8fdc0000 lw gp,0\(s8\) +- 400118: 00401021 move v0,v0 +- 40011c: 3c030000 lui v1,0x0 +- 400120: 24638000 addiu v1,v1,-32768 +- 400124: 00621821 addu v1,v1,v0 +- 400128: 7c02283b rdhwr v0,\$5 +- 40012c: 8f83801c lw v1,-32740\(gp\) +- 400130: 00000000 nop +- 400134: 00621821 addu v1,v1,v0 +- 400138: 7c02283b rdhwr v0,\$5 +- 40013c: 3c030000 lui v1,0x0 +- 400140: 24639004 addiu v1,v1,-28668 +- 400144: 00621821 addu v1,v1,v0 +- 400148: 03c0e821 move sp,s8 +- 40014c: 8fbe0008 lw s8,8\(sp\) +- 400150: 03e00008 jr ra +- 400154: 27bd0010 addiu sp,sp,16 ++00400[0-9a-f]{3} <__start>: ++ 400[0-9a-f]{3}: 3c1c0fc0 lui gp,0xfc0 ++ 400[0-9a-f]{3}: 279c7f30 addiu gp,gp,32560 ++ 400[0-9a-f]{3}: 0399e021 addu gp,gp,t9 ++ 400[0-9a-f]{3}: 27bdfff0 addiu sp,sp,-16 ++ 400[0-9a-f]{3}: afbe0008 sw s8,8\(sp\) ++ 400[0-9a-f]{3}: 03a0f021 move s8,sp ++ 400[0-9a-f]{3}: afbc0000 sw gp,0\(sp\) ++ 400[0-9a-f]{3}: 8f998018 lw t9,-32744\(gp\) ++ 400[0-9a-f]{3}: 27848028 addiu a0,gp,-32728 ++ 400[0-9a-f]{3}: 0320f809 jalr t9 ++ 400[0-9a-f]{3}: 00000000 nop ++ 400[0-9a-f]{3}: 8fdc0000 lw gp,0\(s8\) ++ 400[0-9a-f]{3}: 00000000 nop ++ 400[0-9a-f]{3}: 8f998018 lw t9,-32744\(gp\) ++ 400[0-9a-f]{3}: 27848020 addiu a0,gp,-32736 ++ 400[0-9a-f]{3}: 0320f809 jalr t9 ++ 400[0-9a-f]{3}: 00000000 nop ++ 400[0-9a-f]{3}: 8fdc0000 lw gp,0\(s8\) ++ 400[0-9a-f]{3}: 00401021 move v0,v0 ++ 400[0-9a-f]{3}: 3c030000 lui v1,0x0 ++ 400[0-9a-f]{3}: 24638000 addiu v1,v1,-32768 ++ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 ++ 400[0-9a-f]{3}: 7c02283b rdhwr v0,\$5 ++ 400[0-9a-f]{3}: 8f83801c lw v1,-32740\(gp\) ++ 400[0-9a-f]{3}: 00000000 nop ++ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 ++ 400[0-9a-f]{3}: 7c02283b rdhwr v0,\$5 ++ 400[0-9a-f]{3}: 3c030000 lui v1,0x0 ++ 400[0-9a-f]{3}: 24639004 addiu v1,v1,-28668 ++ 400[0-9a-f]{3}: 00621821 addu v1,v1,v0 ++ 400[0-9a-f]{3}: 03c0e821 move sp,s8 ++ 400[0-9a-f]{3}: 8fbe0008 lw s8,8\(sp\) ++ 400[0-9a-f]{3}: 03e00008 jr ra ++ 400[0-9a-f]{3}: 27bd0010 addiu sp,sp,16 + +-00400158 <__tls_get_addr>: +- 400158: 03e00008 jr ra +- 40015c: 00000000 nop ++00400[0-9a-f]{3} <__tls_get_addr>: ++ 400[0-9a-f]{3}: 03e00008 jr ra ++ 400[0-9a-f]{3}: 00000000 nop +--- binutils-2.23/ld/testsuite/ld-powerpc/tls.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tls.d +@@ -9,45 +9,45 @@ + + Disassembly of section \.text: + +-0+100000e8 <_start>: +- 100000e8: 3c 6d 00 00 addis r3,r13,0 +- 100000ec: 60 00 00 00 nop +- 100000f0: 38 63 90 78 addi r3,r3,-28552 +- 100000f4: 3c 6d 00 00 addis r3,r13,0 +- 100000f8: 60 00 00 00 nop +- 100000fc: 38 63 10 00 addi r3,r3,4096 +- 10000100: 3c 6d 00 00 addis r3,r13,0 +- 10000104: 60 00 00 00 nop +- 10000108: 38 63 90 40 addi r3,r3,-28608 +- 1000010c: 3c 6d 00 00 addis r3,r13,0 +- 10000110: 60 00 00 00 nop +- 10000114: 38 63 10 00 addi r3,r3,4096 +- 10000118: 39 23 80 48 addi r9,r3,-32696 +- 1000011c: 3d 23 00 00 addis r9,r3,0 +- 10000120: 81 49 80 50 lwz r10,-32688\(r9\) +- 10000124: e9 22 80 10 ld r9,-32752\(r2\) +- 10000128: 7d 49 18 2a ldx r10,r9,r3 +- 1000012c: 3d 2d 00 00 addis r9,r13,0 +- 10000130: a1 49 90 60 lhz r10,-28576\(r9\) +- 10000134: 89 4d 90 68 lbz r10,-28568\(r13\) +- 10000138: 3d 2d 00 00 addis r9,r13,0 +- 1000013c: 99 49 90 70 stb r10,-28560\(r9\) +- 10000140: 3c 6d 00 00 addis r3,r13,0 +- 10000144: 60 00 00 00 nop +- 10000148: 38 63 90 00 addi r3,r3,-28672 +- 1000014c: 3c 6d 00 00 addis r3,r13,0 +- 10000150: 60 00 00 00 nop +- 10000154: 38 63 10 00 addi r3,r3,4096 +- 10000158: f9 43 80 08 std r10,-32760\(r3\) +- 1000015c: 3d 23 00 00 addis r9,r3,0 +- 10000160: 91 49 80 10 stw r10,-32752\(r9\) +- 10000164: e9 22 80 08 ld r9,-32760\(r2\) +- 10000168: 7d 49 19 2a stdx r10,r9,r3 +- 1000016c: 3d 2d 00 00 addis r9,r13,0 +- 10000170: b1 49 90 60 sth r10,-28576\(r9\) +- 10000174: e9 4d 90 2a lwa r10,-28632\(r13\) +- 10000178: 3d 2d 00 00 addis r9,r13,0 +- 1000017c: a9 49 90 30 lha r10,-28624\(r9\) ++0+10000[0-9a-f]{3} <_start>: ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 78 addi r3,r3,-28552 ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 40 addi r3,r3,-28608 ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 10000[0-9a-f]{3}: 39 23 80 48 addi r9,r3,-32696 ++ 10000[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 ++ 10000[0-9a-f]{3}: 81 49 80 50 lwz r10,-32688\(r9\) ++ 10000[0-9a-f]{3}: e9 22 80 10 ld r9,-32752\(r2\) ++ 10000[0-9a-f]{3}: 7d 49 18 2a ldx r10,r9,r3 ++ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 ++ 10000[0-9a-f]{3}: a1 49 90 60 lhz r10,-28576\(r9\) ++ 10000[0-9a-f]{3}: 89 4d 90 68 lbz r10,-28568\(r13\) ++ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 ++ 10000[0-9a-f]{3}: 99 49 90 70 stb r10,-28560\(r9\) ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 10000[0-9a-f]{3}: f9 43 80 08 std r10,-32760\(r3\) ++ 10000[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 ++ 10000[0-9a-f]{3}: 91 49 80 10 stw r10,-32752\(r9\) ++ 10000[0-9a-f]{3}: e9 22 80 08 ld r9,-32760\(r2\) ++ 10000[0-9a-f]{3}: 7d 49 19 2a stdx r10,r9,r3 ++ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 ++ 10000[0-9a-f]{3}: b1 49 90 60 sth r10,-28576\(r9\) ++ 10000[0-9a-f]{3}: e9 4d 90 2a lwa r10,-28632\(r13\) ++ 10000[0-9a-f]{3}: 3d 2d 00 00 addis r9,r13,0 ++ 10000[0-9a-f]{3}: a9 49 90 30 lha r10,-28624\(r9\) + +-0+10000180 <\.__tls_get_addr>: +- 10000180: 4e 80 00 20 blr ++0+10000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr +--- binutils-2.23/ld/testsuite/ld-powerpc/tls.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tls.g +@@ -8,5 +8,5 @@ + .*: +file format elf64-powerpc + + Contents of section \.got: +- 100101e0 00000000 100181e0 ffffffff ffff8018 .* +- 100101f0 ffffffff ffff8058 .* ++ 10010([0-9a-f]{3}) 00000000 10018\1 ffffffff ffff8018 .* ++ 10010[0-9a-f]{3} ffffffff ffff8058 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.d +@@ -9,42 +9,42 @@ + + Disassembly of section \.text: + +-0+1800094 <_start>: +- 1800094: 3c 62 00 00 addis r3,r2,0 +- 1800098: 38 63 90 3c addi r3,r3,-28612 +- 180009c: 3c 62 00 00 addis r3,r2,0 +- 18000a0: 38 63 10 00 addi r3,r3,4096 +- 18000a4: 3c 62 00 00 addis r3,r2,0 +- 18000a8: 38 63 90 20 addi r3,r3,-28640 +- 18000ac: 3c 62 00 00 addis r3,r2,0 +- 18000b0: 38 63 10 00 addi r3,r3,4096 +- 18000b4: 39 23 80 24 addi r9,r3,-32732 +- 18000b8: 3d 23 00 00 addis r9,r3,0 +- 18000bc: 81 49 80 28 lwz r10,-32728\(r9\) +- 18000c0: 3d 22 00 00 addis r9,r2,0 +- 18000c4: a1 49 90 30 lhz r10,-28624\(r9\) +- 18000c8: 89 42 90 34 lbz r10,-28620\(r2\) +- 18000cc: 3d 22 00 00 addis r9,r2,0 +- 18000d0: 99 49 90 38 stb r10,-28616\(r9\) +- 18000d4: 3c 62 00 00 addis r3,r2,0 +- 18000d8: 38 63 90 00 addi r3,r3,-28672 +- 18000dc: 3c 62 00 00 addis r3,r2,0 +- 18000e0: 38 63 10 00 addi r3,r3,4096 +- 18000e4: 91 43 80 04 stw r10,-32764\(r3\) +- 18000e8: 3d 23 00 00 addis r9,r3,0 +- 18000ec: 91 49 80 08 stw r10,-32760\(r9\) +- 18000f0: 3d 22 00 00 addis r9,r2,0 +- 18000f4: b1 49 90 30 sth r10,-28624\(r9\) +- 18000f8: a1 42 90 14 lhz r10,-28652\(r2\) +- 18000fc: 3d 22 00 00 addis r9,r2,0 +- 1800100: a9 49 90 18 lha r10,-28648\(r9\) ++0+1800[0-9a-f]{3} <_start>: ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 90 3c addi r3,r3,-28612 ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 90 20 addi r3,r3,-28640 ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 1800[0-9a-f]{3}: 39 23 80 24 addi r9,r3,-32732 ++ 1800[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 ++ 1800[0-9a-f]{3}: 81 49 80 28 lwz r10,-32728\(r9\) ++ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 ++ 1800[0-9a-f]{3}: a1 49 90 30 lhz r10,-28624\(r9\) ++ 1800[0-9a-f]{3}: 89 42 90 34 lbz r10,-28620\(r2\) ++ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 ++ 1800[0-9a-f]{3}: 99 49 90 38 stb r10,-28616\(r9\) ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 ++ 1800[0-9a-f]{3}: 3c 62 00 00 addis r3,r2,0 ++ 1800[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 1800[0-9a-f]{3}: 91 43 80 04 stw r10,-32764\(r3\) ++ 1800[0-9a-f]{3}: 3d 23 00 00 addis r9,r3,0 ++ 1800[0-9a-f]{3}: 91 49 80 08 stw r10,-32760\(r9\) ++ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 ++ 1800[0-9a-f]{3}: b1 49 90 30 sth r10,-28624\(r9\) ++ 1800[0-9a-f]{3}: a1 42 90 14 lhz r10,-28652\(r2\) ++ 1800[0-9a-f]{3}: 3d 22 00 00 addis r9,r2,0 ++ 1800[0-9a-f]{3}: a9 49 90 18 lha r10,-28648\(r9\) + +-0+1800104 <__tls_get_addr>: +- 1800104: 4e 80 00 20 blr ++0+1800[0-9a-f]{3} <__tls_get_addr>: ++ 1800[0-9a-f]{3}: 4e 80 00 20 blr + Disassembly of section \.got: + +-0+1810128 <_GLOBAL_OFFSET_TABLE_-0x4>: +- 1810128: 4e 80 00 21 blrl ++0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_-0x4>: ++ 1810[0-9a-f]{3}: 4e 80 00 21 blrl + +-0+181012c <_GLOBAL_OFFSET_TABLE_>: ++0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_>: + \.\.\. +--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.g +@@ -8,4 +8,4 @@ + .*: +file format elf32-powerpc + + Contents of section \.got: +- 1810128 4e800021 00000000 00000000 00000000 .* ++ 18101[0-9a-f]{2} 4e800021 00000000 00000000 00000000 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tls32.t ++++ binutils-2.23/ld/testsuite/ld-powerpc/tls32.t +@@ -8,5 +8,5 @@ + .*: +file format elf32-powerpc + + Contents of section \.tdata: +- 1810108 12345678 23456789 3456789a 456789ab .* +- 1810118 56789abc 6789abcd 789abcde 00c0ffee .* ++ 18101[0-9a-f]{2} 12345678 23456789 3456789a 456789ab .* ++ 18101[0-9a-f]{2} 56789abc 6789abcd 789abcde 00c0ffee .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.d +@@ -44,4 +44,4 @@ Disassembly of section \.got: + .*: 4e 80 00 21 blrl + + .* <_GLOBAL_OFFSET_TABLE_>: +-.*: 01 81 02 b8 00 00 00 00 00 00 00 00 .* ++.*: 01 81 02 [bd]8 00 00 00 00 00 00 00 00 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.g +@@ -8,4 +8,4 @@ + + Contents of section \.got: + .* 00000000 00000000 00000000 4e800021 .* +-.* 018102b8 00000000 00000000 .* ++.* 018102[bd]8 00000000 00000000 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsexe32.r +@@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align +- +PHDR +0x000034 0x01800034 0x01800034 0x000c0 0x000c0 R E 0x4 +- +INTERP +0x0000f4 0x018000f4 0x018000f4 0x00011 0x00011 R +0x1 ++ +PHDR +0x000034 0x01800034 0x01800034 (0x000[0-9a-f]{2}) \1 R E 0x4 ++ +INTERP +0x000([0-9a-f]{3}) 0x01800\1 0x01800\1 0x00011 0x00011 R +0x1 + +\[Requesting program interpreter: .*\] + +LOAD .* R E 0x10000 + +LOAD .* RWE 0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0001c 0x00038 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections\.\.\. +@@ -49,6 +50,7 @@ Program Headers: + +03 +\.tdata \.dynamic \.got \.plt + +04 +\.dynamic + +05 +\.tdata \.tbss ++ +06 + + + Relocation section '\.rela\.dyn' at offset .* contains 2 entries: + Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark.d +@@ -9,29 +9,29 @@ + + Disassembly of section \.text: + +-0+100000e8 <_start>: +- 100000e8: 48 00 00 18 b 10000100 <_start\+0x18> +- 100000ec: 60 00 00 00 nop +- 100000f0: 38 63 90 00 addi r3,r3,-28672 +- 100000f4: e8 83 00 00 ld r4,0\(r3\) +- 100000f8: 3c 6d 00 00 addis r3,r13,0 +- 100000fc: 48 00 00 0c b 10000108 <_start\+0x20> +- 10000100: 3c 6d 00 00 addis r3,r13,0 +- 10000104: 4b ff ff e8 b 100000ec <_start\+0x4> +- 10000108: 60 00 00 00 nop +- 1000010c: 38 63 10 00 addi r3,r3,4096 +- 10000110: e8 83 80 00 ld r4,-32768\(r3\) +- 10000114: 3c 6d 00 00 addis r3,r13,0 +- 10000118: 48 00 00 0c b 10000124 <_start\+0x3c> +- 1000011c: 3c 6d 00 00 addis r3,r13,0 +- 10000120: 48 00 00 14 b 10000134 <_start\+0x4c> +- 10000124: 60 00 00 00 nop +- 10000128: 38 63 90 04 addi r3,r3,-28668 +- 1000012c: e8 a3 00 00 ld r5,0\(r3\) +- 10000130: 4b ff ff ec b 1000011c <_start\+0x34> +- 10000134: 60 00 00 00 nop +- 10000138: 38 63 10 00 addi r3,r3,4096 +- 1000013c: e8 a3 80 04 ld r5,-32764\(r3\) ++0+10000[0-9a-f]{3} <_start>: ++ 10000[0-9a-f]{3}: 48 00 00 18 b 10000[0-9a-f]{3} <_start\+0x18> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 00 addi r3,r3,-28672 ++ 10000[0-9a-f]{3}: e8 83 00 00 ld r4,0\(r3\) ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 48 00 00 0c b 10000[0-9a-f]{3} <_start\+0x20> ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 4b ff ff e8 b 10000[0-9a-f]{3} <_start\+0x4> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 10000[0-9a-f]{3}: e8 83 80 00 ld r4,-32768\(r3\) ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 48 00 00 0c b 10000[0-9a-f]{3} <_start\+0x3c> ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 48 00 00 14 b 10000[0-9a-f]{3} <_start\+0x4c> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 04 addi r3,r3,-28668 ++ 10000[0-9a-f]{3}: e8 a3 00 00 ld r5,0\(r3\) ++ 10000[0-9a-f]{3}: 4b ff ff ec b 10000[0-9a-f]{3} <_start\+0x34> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 10 00 addi r3,r3,4096 ++ 10000[0-9a-f]{3}: e8 a3 80 04 ld r5,-32764\(r3\) + +-0+10000140 <\.__tls_get_addr>: +- 10000140: 4e 80 00 20 blr ++0+10000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsmark32.d +@@ -9,17 +9,17 @@ + + Disassembly of section \.text: + +-0+1800094 <_start>: +- 1800094: 48 00 00 14 b 18000a8 <_start\+0x14> +- 1800098: 38 63 90 00 addi r3,r3,-28672 +- 180009c: 80 83 00 00 lwz r4,0\(r3\) +- 18000a0: 3c 62 00 00 addis r3,r2,0 +- 18000a4: 48 00 00 0c b 18000b0 <_start\+0x1c> +- 18000a8: 3c 62 00 00 addis r3,r2,0 +- 18000ac: 4b ff ff ec b 1800098 <_start\+0x4> +- 18000b0: 38 63 10 00 addi r3,r3,4096 +- 18000b4: 80 83 80 00 lwz r4,-32768\(r3\) ++0+18000[0-9a-f]{2} <_start>: ++ 18000[0-9a-f]{2}: 48 00 00 14 b 18000[0-9a-f]{2} <_start\+0x14> ++ 18000[0-9a-f]{2}: 38 63 90 00 addi r3,r3,-28672 ++ 18000[0-9a-f]{2}: 80 83 00 00 lwz r4,0\(r3\) ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 48 00 00 0c b 18000[0-9a-f]{2} <_start\+0x1c> ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 4b ff ff ec b 18000[0-9a-f]{2} <_start\+0x4> ++ 18000[0-9a-f]{2}: 38 63 10 00 addi r3,r3,4096 ++ 18000[0-9a-f]{2}: 80 83 80 00 lwz r4,-32768\(r3\) + +-0+18000b8 <__tls_get_addr>: +- 18000b8: 4e 80 00 20 blr +-#pass +\ No newline at end of file ++0+18000[0-9a-f]{2} <__tls_get_addr>: ++ 18000[0-9a-f]{2}: 4e 80 00 20 blr ++#pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1.d +@@ -9,17 +9,17 @@ + + Disassembly of section \.text: + +-0+100000e8 <\.__tls_get_addr>: +- 100000e8: 4e 80 00 20 blr ++0+10000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr + + Disassembly of section \.no_opt1: + +-0+100000ec <\.no_opt1>: +- 100000ec: 38 62 80 08 addi r3,r2,-32760 +- 100000f0: 2c 24 00 00 cmpdi r4,0 +- 100000f4: 41 82 00 10 beq- .* +- 100000f8: 4b ff ff f1 bl 100000e8 <\.__tls_get_addr> +- 100000fc: 60 00 00 00 nop +- 10000100: 48 00 00 0c b .* +- 10000104: 4b ff ff e5 bl 100000e8 <\.__tls_get_addr> +- 10000108: 60 00 00 00 nop ++0+10000[0-9a-f]{3} <\.no_opt1>: ++ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 ++ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 ++ 10000[0-9a-f]{3}: 41 82 00 10 beq- .* ++ 10000[0-9a-f]{3}: 4b ff ff f1 bl 10000[0-9a-f]{3} <\.__tls_get_addr> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 4b ff ff e5 bl 10000[0-9a-f]{3} <\.__tls_get_addr> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt1_32.d +@@ -9,16 +9,16 @@ + + Disassembly of section \.text: + +-0+1800094 <__tls_get_addr>: +- 1800094: 4e 80 00 20 blr ++0+18000[0-9a-f]{2} <__tls_get_addr>: ++ 18000[0-9a-f]{2}: 4e 80 00 20 blr + + Disassembly of section \.no_opt1: + +-0+1800098 <\.no_opt1>: +- 1800098: 38 6d ff f4 addi r3,r13,-12 +- 180009c: 2c 04 00 00 cmpwi r4,0 +- 18000a0: 41 82 00 0c beq- .* +- 18000a4: 4b ff ff f1 bl 1800094 <__tls_get_addr> +- 18000a8: 48 00 00 08 b .* +- 18000ac: 4b ff ff e9 bl 1800094 <__tls_get_addr> ++0+18000[0-9a-f]{2} <\.no_opt1>: ++ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 ++ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 ++ 18000[0-9a-f]{2}: 41 82 00 0c beq- .* ++ 18000[0-9a-f]{2}: 4b ff ff f1 bl 18000[0-9a-f]{2} <__tls_get_addr> ++ 18000[0-9a-f]{2}: 48 00 00 08 b .* ++ 18000[0-9a-f]{2}: 4b ff ff e9 bl 18000[0-9a-f]{2} <__tls_get_addr> + #pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2.d +@@ -9,15 +9,15 @@ + + Disassembly of section \.text: + +-0+100000e8 <\.__tls_get_addr>: +- 100000e8: 4e 80 00 20 blr ++0+10000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr + + Disassembly of section \.no_opt2: + +-0+100000ec <\.no_opt2>: +- 100000ec: 38 62 80 08 addi r3,r2,-32760 +- 100000f0: 2c 24 00 00 cmpdi r4,0 +- 100000f4: 41 82 00 08 beq- .* +- 100000f8: 38 62 80 08 addi r3,r2,-32760 +- 100000fc: 4b ff ff ed bl 100000e8 <\.__tls_get_addr> +- 10000100: 60 00 00 00 nop ++0+10000[0-9a-f]{3} <\.no_opt2>: ++ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 ++ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 ++ 10000[0-9a-f]{3}: 41 82 00 08 beq- .* ++ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 ++ 10000[0-9a-f]{3}: 4b ff ff ed bl 10000[0-9a-f]{3} <\.__tls_get_addr> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt2_32.d +@@ -9,15 +9,15 @@ + + Disassembly of section \.text: + +-0+1800094 <__tls_get_addr>: +- 1800094: 4e 80 00 20 blr ++0+18000[0-9a-f]{2} <__tls_get_addr>: ++ 18000[0-9a-f]{2}: 4e 80 00 20 blr + + Disassembly of section \.no_opt2: + +-0+1800098 <\.no_opt2>: +- 1800098: 38 6d ff f4 addi r3,r13,-12 +- 180009c: 2c 04 00 00 cmpwi r4,0 +- 18000a0: 41 82 00 08 beq- .* +- 18000a4: 38 6d ff f4 addi r3,r13,-12 +- 18000a8: 4b ff ff ed bl 1800094 <__tls_get_addr> ++0+18000[0-9a-f]{2} <\.no_opt2>: ++ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 ++ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 ++ 18000[0-9a-f]{2}: 41 82 00 08 beq- .* ++ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 ++ 18000[0-9a-f]{2}: 4b ff ff ed bl 18000[0-9a-f]{2} <__tls_get_addr> + #pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3.d +@@ -9,18 +9,18 @@ + + Disassembly of section \.text: + +-00000000100000e8 <\.__tls_get_addr>: +- 100000e8: 4e 80 00 20 blr ++0000000010000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr + + Disassembly of section \.no_opt3: + +-00000000100000ec <\.no_opt3>: +- 100000ec: 38 62 80 08 addi r3,r2,-32760 +- 100000f0: 48 00 00 0c b .* +- 100000f4: 38 62 80 18 addi r3,r2,-32744 +- 100000f8: 48 00 00 10 b .* +- 100000fc: 4b ff ff ed bl 100000e8 <\.__tls_get_addr> +- 10000100: 60 00 00 00 nop +- 10000104: 48 00 00 0c b .* +- 10000108: 4b ff ff e1 bl 100000e8 <\.__tls_get_addr> +- 1000010c: 60 00 00 00 nop ++0000000010000[0-9a-f]{3} <\.no_opt3>: ++ 10000[0-9a-f]{3}: 38 62 80 08 addi r3,r2,-32760 ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 38 62 80 18 addi r3,r2,-32744 ++ 10000[0-9a-f]{3}: 48 00 00 10 b .* ++ 10000[0-9a-f]{3}: 4b ff ff ed bl 10000[0-9a-f]{3} <\.__tls_get_addr> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 4b ff ff e1 bl 10000[0-9a-f]{3} <\.__tls_get_addr> ++ 10000[0-9a-f]{3}: 60 00 00 00 nop +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt3_32.d +@@ -9,17 +9,17 @@ + + Disassembly of section \.text: + +-0+1800094 <__tls_get_addr>: +- 1800094: 4e 80 00 20 blr ++0+18000[0-9a-f]{2} <__tls_get_addr>: ++ 18000[0-9a-f]{2}: 4e 80 00 20 blr + + Disassembly of section \.no_opt3: + +-0+1800098 <\.no_opt3>: +- 1800098: 38 6d ff ec addi r3,r13,-20 +- 180009c: 48 00 00 0c b .* +- 18000a0: 38 6d ff f4 addi r3,r13,-12 +- 18000a4: 48 00 00 0c b .* +- 18000a8: 4b ff ff ed bl 1800094 <__tls_get_addr> +- 18000ac: 48 00 00 08 b .* +- 18000b0: 4b ff ff e5 bl 1800094 <__tls_get_addr> ++0+18000[0-9a-f]{2} <\.no_opt3>: ++ 18000[0-9a-f]{2}: 38 6d ff ec addi r3,r13,-20 ++ 18000[0-9a-f]{2}: 48 00 00 0c b .* ++ 18000[0-9a-f]{2}: 38 6d ff f4 addi r3,r13,-12 ++ 18000[0-9a-f]{2}: 48 00 00 0c b .* ++ 18000[0-9a-f]{2}: 4b ff ff ed bl 18000[0-9a-f]{2} <__tls_get_addr> ++ 18000[0-9a-f]{2}: 48 00 00 08 b .* ++ 18000[0-9a-f]{2}: 4b ff ff e5 bl 18000[0-9a-f]{2} <__tls_get_addr> + #pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4.d +@@ -9,40 +9,40 @@ + + Disassembly of section \.text: + +-0+100000e8 <\.__tls_get_addr>: +- 100000e8: 4e 80 00 20 blr ++0+10000[0-9a-f]{3} <\.__tls_get_addr>: ++ 10000[0-9a-f]{3}: 4e 80 00 20 blr + + Disassembly of section \.opt1: + +-0+100000ec <\.opt1>: +- 100000ec: 3c 6d 00 00 addis r3,r13,0 +- 100000f0: 2c 24 00 00 cmpdi r4,0 +- 100000f4: 41 82 00 10 beq- .* +- 100000f8: 60 00 00 00 nop +- 100000fc: 38 63 90 10 addi r3,r3,-28656 +- 10000100: 48 00 00 0c b .* +- 10000104: 60 00 00 00 nop +- 10000108: 38 63 90 10 addi r3,r3,-28656 ++0+10000[0-9a-f]{3} <\.opt1>: ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 ++ 10000[0-9a-f]{3}: 41 82 00 10 beq- .* ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 + + Disassembly of section \.opt2: + +-0+1000010c <\.opt2>: +- 1000010c: 3c 6d 00 00 addis r3,r13,0 +- 10000110: 2c 24 00 00 cmpdi r4,0 +- 10000114: 41 82 00 08 beq- .* +- 10000118: 3c 6d 00 00 addis r3,r13,0 +- 1000011c: 60 00 00 00 nop +- 10000120: 38 63 90 10 addi r3,r3,-28656 ++0+10000[0-9a-f]{3} <\.opt2>: ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 2c 24 00 00 cmpdi r4,0 ++ 10000[0-9a-f]{3}: 41 82 00 08 beq- .* ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 + + Disassembly of section \.opt3: + +-0+10000124 <\.opt3>: +- 10000124: 3c 6d 00 00 addis r3,r13,0 +- 10000128: 48 00 00 0c b .* +- 1000012c: 3c 6d 00 00 addis r3,r13,0 +- 10000130: 48 00 00 10 b .* +- 10000134: 60 00 00 00 nop +- 10000138: 38 63 90 10 addi r3,r3,-28656 +- 1000013c: 48 00 00 0c b .* +- 10000140: 60 00 00 00 nop +- 10000144: 38 63 90 08 addi r3,r3,-28664 ++0+10000[0-9a-f]{3} <\.opt3>: ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 3c 6d 00 00 addis r3,r13,0 ++ 10000[0-9a-f]{3}: 48 00 00 10 b .* ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 10 addi r3,r3,-28656 ++ 10000[0-9a-f]{3}: 48 00 00 0c b .* ++ 10000[0-9a-f]{3}: 60 00 00 00 nop ++ 10000[0-9a-f]{3}: 38 63 90 08 addi r3,r3,-28664 +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsopt4_32.d +@@ -9,36 +9,36 @@ + + Disassembly of section \.text: + +-0+1800094 <__tls_get_addr>: +- 1800094: 4e 80 00 20 blr ++0+18000[0-9a-f]{2} <__tls_get_addr>: ++ 18000[0-9a-f]{2}: 4e 80 00 20 blr + + Disassembly of section \.opt1: + +-0+1800098 <\.opt1>: +- 1800098: 3c 62 00 00 addis r3,r2,0 +- 180009c: 2c 04 00 00 cmpwi r4,0 +- 18000a0: 41 82 00 0c beq- .* +- 18000a4: 38 63 90 10 addi r3,r3,-28656 +- 18000a8: 48 00 00 08 b .* +- 18000ac: 38 63 90 10 addi r3,r3,-28656 ++0+18000[0-9a-f]{2} <\.opt1>: ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 ++ 18000[0-9a-f]{2}: 41 82 00 0c beq- .* ++ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 ++ 18000[0-9a-f]{2}: 48 00 00 08 b .* ++ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 + + Disassembly of section \.opt2: + +-0+18000b0 <\.opt2>: +- 18000b0: 3c 62 00 00 addis r3,r2,0 +- 18000b4: 2c 04 00 00 cmpwi r4,0 +- 18000b8: 41 82 00 08 beq- .* +- 18000bc: 3c 62 00 00 addis r3,r2,0 +- 18000c0: 38 63 90 10 addi r3,r3,-28656 ++0+18000[0-9a-f]{2} <\.opt2>: ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 2c 04 00 00 cmpwi r4,0 ++ 18000[0-9a-f]{2}: 41 82 00 08 beq- .* ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 + + Disassembly of section \.opt3: + +-0+18000c4 <\.opt3>: +- 18000c4: 3c 62 00 00 addis r3,r2,0 +- 18000c8: 48 00 00 0c b .* +- 18000cc: 3c 62 00 00 addis r3,r2,0 +- 18000d0: 48 00 00 0c b .* +- 18000d4: 38 63 90 10 addi r3,r3,-28656 +- 18000d8: 48 00 00 08 b .* +- 18000dc: 38 63 90 08 addi r3,r3,-28664 ++0+18000[0-9a-f]{2} <\.opt3>: ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 48 00 00 0c b .* ++ 18000[0-9a-f]{2}: 3c 62 00 00 addis r3,r2,0 ++ 18000[0-9a-f]{2}: 48 00 00 0c b .* ++ 18000[0-9a-f]{2}: 38 63 90 10 addi r3,r3,-28656 ++ 18000[0-9a-f]{2}: 48 00 00 08 b .* ++ 18000[0-9a-f]{2}: 38 63 90 08 addi r3,r3,-28664 + #pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.d +@@ -42,5 +42,5 @@ Disassembly of section \.got: + #... + .*: 4e 80 00 21 blrl + .* <_GLOBAL_OFFSET_TABLE_>: +-.*: 00 01 03 ec .* ++.*: 00 01 [0-9a-f]{2} [0-9a-f]{2} .* + #pass +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.g +@@ -9,5 +9,5 @@ + Contents of section \.got: + .* 00000000 00000000 00000000 00000000 .* + .* 00000000 00000000 00000000 00000000 .* +-.* 00000000 4e800021 000103ec 00000000 .* ++.* 00000000 4e800021 00010[0-9a-f]{3} 00000000 .* + .* 00000000 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlsso32.r +@@ -35,6 +35,7 @@ Program Headers: + +LOAD .* RWE 0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+1c 0x0+38 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections\.\.\. +@@ -42,6 +43,7 @@ Program Headers: + +01 +\.tdata \.dynamic \.got \.plt + +02 +\.dynamic + +03 +\.tdata \.tbss ++ +04 + + + Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries: + Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend +@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries: + [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0 + [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0 + [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0 +-[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4 +-[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8 +-[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8 ++[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} ++[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} ++[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3} + [0-9a-f ]+R_PPC_DTPMOD32 +0 + [0-9a-f ]+R_PPC_DTPREL32 +0 + [0-9a-f ]+R_PPC_DTPMOD32 +0 +--- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.g +@@ -8,8 +8,8 @@ + .*: +file format elf64-powerpc + + Contents of section \.got: +- 100101a0 00000000 00000001 00000000 00000000 .* +- 100101b0 00000000 00000001 00000000 00000000 .* +- 100101c0 00000000 00000001 00000000 00000000 .* +- 100101d0 00000000 00000001 00000000 00000000 .* +- 100101e0 ffffffff ffff8060 00000000 00000000 .* ++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* ++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* ++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* ++ 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000 .* ++ 10010[0-9a-f]{3} ffffffff ffff8060 00000000 00000000 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstoc.t +@@ -8,7 +8,7 @@ + .*: +file format elf64-powerpc + + Contents of section \.tdata: +- 10010148 00c0ffee 00000000 12345678 9abcdef0 .* +- 10010158 23456789 abcdef01 3456789a bcdef012 .* +- 10010168 456789ab cdef0123 56789abc def01234 .* +- 10010178 6789abcd ef012345 789abcde f0123456 .* ++ 10010180 00c0ffee 00000000 12345678 9abcdef0 .* ++ 10010190 23456789 abcdef01 3456789a bcdef012 .* ++ 100101a0 456789ab cdef0123 56789abc def01234 .* ++ 100101b0 6789abcd ef012345 789abcde f0123456 .* +--- binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g ++++ binutils-2.23/ld/testsuite/ld-powerpc/tlstocso.g +@@ -7,7 +7,7 @@ + .*: +file format elf64-powerpc + + Contents of section \.got: +-.* 00000000 000186c0 00000000 00000000 .* ++.* 00000000 000186f8 00000000 00000000 .* + .* 00000000 00000000 00000000 00000000 .* + .* 00000000 00000000 00000000 00000000 .* + .* 00000000 00000000 00000000 00000000 .* +--- binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd ++++ binutils-2.23/ld/testsuite/ld-s390/tlsbin.rd +@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+60 0x0+a0 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -52,6 +53,7 @@ Program Headers: + +03 +.tdata .dynamic .got * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rela.dyn' at offset .* contains 4 entries: + Offset +Info +Type +Sym.Value +Sym. Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd ++++ binutils-2.23/ld/testsuite/ld-s390/tlsbin_64.rd +@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+a0 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -52,6 +53,7 @@ Program Headers: + +03 +.tdata .dynamic .got * + +04 +.dynamic * + +05 +.tdata .tbss * ++ +06 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-s390/tlspic.rd ++++ binutils-2.23/ld/testsuite/ld-s390/tlspic.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+60 0x0+80 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got + +02 +.dynamic + +03 +.tdata .tbss ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + Offset +Info +Type +Sym.Value +Sym. Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd ++++ binutils-2.23/ld/testsuite/ld-s390/tlspic_64.rd +@@ -39,6 +39,7 @@ Program Headers: + +LOAD .* RW +0x1000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+80 R +0x20 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -46,6 +47,7 @@ Program Headers: + +01 +.tdata .dynamic .got * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d ++++ binutils-2.23/ld/testsuite/ld-scripts/empty-aligned.d +@@ -8,7 +8,9 @@ + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+ ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections\.\.\. + +00 +.text ++ +01 + +--- binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d ++++ binutils-2.23/ld/testsuite/ld-sh/tlsbin-2.d +@@ -44,6 +44,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+18 0x0+28 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections\.\.\. +@@ -53,6 +54,7 @@ Program Headers: + +03 +\.tdata \.dynamic \.got * + +04 +\.dynamic * + +05 +\.tdata \.tbss * ++ +06 + + + Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries: + Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d ++++ binutils-2.23/ld/testsuite/ld-sh/tlspic-2.d +@@ -32,7 +32,7 @@ Key to Flags: + + Elf file type is DYN \(Shared object file\) + Entry point 0x[0-9a-f]+ +-There are 4 program headers, starting at offset [0-9]+ ++There are [0-9] program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +@@ -40,6 +40,7 @@ Program Headers: + +LOAD.* + +DYNAMIC.* + +TLS .* 0x0+18 0x0+20 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections\.\.\. +@@ -47,6 +48,7 @@ Program Headers: + +01 +\.tdata \.dynamic \.got * + +02 +\.dynamic * + +03 +\.tdata \.tbss * ++ +04 + + + Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries: + Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/gotop32.rd +@@ -31,6 +31,7 @@ Program Headers: + +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000 + +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000 + +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+70 0x0+70 RW +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/gotop64.rd +@@ -31,6 +31,7 @@ Program Headers: + +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000 + +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000 + +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+e0 0x0+e0 RW +0x8 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin32.rd +@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align +- +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4 +- +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1 ++ +PHDR +0x0+34 0x0+10034 0x0+10034 (0x[0-9a-f]+) \1 R E 0x4 ++ +INTERP +(0x[0-9a-f]+ ){3}0x0+11 0x0+11 R +0x1 + .*Requesting program interpreter.* + +LOAD .* R E 0x10000 + +LOAD .* RW +0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+1060 0x0+10a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunbin64.rd +@@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+ + + Program Headers: + +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align +- +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8 +- +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1 ++ +PHDR +0x0+40 0x0+100040 0x0+100040 (0x[0-9a-f]+) \1 R E 0x8 ++ +INTERP +0x0+([0-9a-f]+) (0x0+10+\1) \2 0x0+19 0x0+19 R +0x1 + .*Requesting program interpreter.* + +LOAD .* R E 0x100000 + +LOAD .* RW +0x100000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+60 0x0+a0 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic32.rd +@@ -32,6 +32,7 @@ Program Headers: + +LOAD .* RW +0x10000 + +DYNAMIC .* RW +0x4 + +TLS .* 0x0+ 0x0+24 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunnopic64.rd +@@ -32,6 +32,7 @@ Program Headers: + +LOAD .* RW +0x100000 + +DYNAMIC .* RW +0x8 + +TLS .* 0x0+ 0x0+24 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic32.rd +@@ -36,6 +36,7 @@ Program Headers: + +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000 + +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4 + +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd ++++ binutils-2.23/ld/testsuite/ld-sparc/tlssunpic64.rd +@@ -36,6 +36,7 @@ Program Headers: + +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000 + +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8 + +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+60 0x0+80 R +0x4 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + #... + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: +--- binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd ++++ binutils-2.23/ld/testsuite/ld-x86-64/tlsgdesc.rd +@@ -36,12 +36,14 @@ Program Headers: + +LOAD.* + +LOAD.* + +DYNAMIC.* ++ +PAX_FLAGS.* + + Section to Segment mapping: + +Segment Sections... + +00 +.hash .dynsym .dynstr .rela.dyn .rela.plt .plt .text * + +01 +.dynamic .got .got.plt * + +02 +.dynamic * ++ +03 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend +--- binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd ++++ binutils-2.23/ld/testsuite/ld-x86-64/tlspic.rd +@@ -40,6 +40,7 @@ Program Headers: + +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000 + +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8 + +TLS +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+60 0x0+80 R +0x1 ++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48] + + Section to Segment mapping: + +Segment Sections... +@@ -47,6 +48,7 @@ Program Headers: + +01 +.tdata .dynamic .got .got.plt * + +02 +.dynamic * + +03 +.tdata .tbss * ++ +04 + + + Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 4a278e052fa2e..f344156f6bc50 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,22 +2,13 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w"; + sha256 = "11db1g109g0g5si0s50yd99ja5f8j4asxb081clvx78r9d9i2w0i"; url = "mirror://samba/ccache/${name}.tar.xz"; }; - patches = [ - (fetchpatch { - sha256 = "1gwnxx1w2nx1szi0v5vgwcx9i23pxygkqqnrawhal68qgz5c34wh"; - name = "dont-update-manifest-in-readonly-modes.patch"; - # The primary git.samba.org doesn't seem to like our curl much... - url = "https://github.com/jrosdahl/ccache/commit/a7ab503f07e31ebeaaec34fbaa30e264308a299d.patch"; - }) - ]; - buildInputs = [ zlib ]; postPatch = '' diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index f3a986e643239..d0a68caace685 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name="dfu-util-${version}"; - version = "0.8"; + version = "0.9"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { - url = "mirror://debian/pool/main/d/dfu-util/dfu-util_0.8.orig.tar.gz"; - sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; + url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index cb534d511eaf5..72bbe50422cae 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin" + wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 97031a533fae9..9f04e28372225 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus.libs dbus_glib ]; + buildInputs = [ pkgconfig glib dbus dbus_glib ]; meta = { homepage = http://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 5fdccc9acadd6..e6b81ca7eb178 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ltdl-include=${libtool}/include" - "--with-ltdl-lib=${libtool}/lib" + "--with-ltdl-lib=${libtool.lib}/lib" "--with-ncurses=${ncurses}" "--with-sqlite3=${sqlite}" "--with-exuberant-ctags=${ctags}/bin/ctags" diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 5d27b469680b0..27ec2772e0953 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; + outputs = [ "out" "lib" ]; + propagatedNativeBuildInputs = [ m4 ]; nativeBuildInputs = [ perl help2man ]; @@ -43,4 +45,3 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } - diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index d76898aab2edc..807b2a9a49dbd 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; + #doCheck = true; # problems when loading libc.so.6 + meta = { homepage = http://nixos.org/patchelf.html; license = "GPL"; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index d7246d22ca734..d0e63469987be 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,6 +1,9 @@ -{stdenv, fetchurl, automake, libiconv, vanilla ? false}: +{stdenv, fetchurl, automake, libiconv, vanilla ? false }: -stdenv.mkDerivation (rec { +let + inherit (stdenv.lib) optional; +in +stdenv.mkDerivation rec { name = "pkg-config-0.29"; setupHook = ./setup-hook.sh; @@ -12,17 +15,19 @@ stdenv.mkDerivation (rec { ]; sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; }; + # Process Requires.private properly, see + # http://bugs.freedesktop.org/show_bug.cgi?id=4738. + patches = optional (!vanilla) ./requires-private.patch + ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; + preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") + ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; - patches = (if vanilla then [] else [ - # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738. - ./requires-private.patch - ]) ++ stdenv.lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; + postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file meta = { description = "A tool that allows packages to find out information about other packages"; @@ -30,9 +35,5 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; -} // (if stdenv.system == "mips64el-linux" then - { - preConfigure = '' - cp -v ${automake}/share/automake*/config.{sub,guess} . - ''; - } else {})) +} + diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 99582e0f8a3d7..d01a2f9cdd066 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; }; - buildInputs = [ perl xz ] + buildInputs = [ perl xz.bin ] ++ optional interactive ncurses ++ optional doCheck procps; # for tests diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile new file mode 100644 index 0000000000000..d52f576be243a --- /dev/null +++ b/pkgs/development/tools/misc/travis/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "travis" diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock new file mode 100644 index 0000000000000..e84e87fb5232b --- /dev/null +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -0,0 +1,51 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.4.0) + backports (3.6.8) + ethon (0.8.1) + ffi (>= 1.3.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + ffi (1.9.10) + gh (0.14.0) + addressable + backports + faraday (~> 0.8) + multi_json (~> 1.0) + net-http-persistent (>= 2.7) + net-http-pipeline + highline (1.7.8) + json (1.8.3) + launchy (2.4.3) + addressable (~> 2.3) + multi_json (1.11.2) + multipart-post (2.0.0) + net-http-persistent (2.9.4) + net-http-pipeline (1.0.1) + pusher-client (0.6.2) + json + websocket (~> 1.0) + travis (1.8.2) + backports + faraday (~> 0.9) + faraday_middleware (~> 0.9, >= 0.9.1) + gh (~> 0.13) + highline (~> 1.6) + launchy (~> 2.1) + pusher-client (~> 0.4) + typhoeus (~> 0.6, >= 0.6.8) + typhoeus (0.8.0) + ethon (>= 0.8.0) + websocket (1.2.2) + +PLATFORMS + ruby + +DEPENDENCIES + travis + +BUNDLED WITH + 1.11.2 diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix new file mode 100644 index 0000000000000..adc63ce7c43f8 --- /dev/null +++ b/pkgs/development/tools/misc/travis/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, bundlerEnv, ruby }: + +stdenv.mkDerivation rec { + name = "travis-${version}"; + version = env.gems.travis.version; + + env = bundlerEnv { + inherit ruby; + name = "${name}-gems"; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + }; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/travis $out/bin/travis + ''; + + meta = with lib; { + description = "CLI and Ruby client library for Travis CI"; + homepage = https://github.com/travis-ci/travis.rb; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + platforms = ruby.meta.platforms; + }; +} diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix new file mode 100644 index 0000000000000..abfd352e90ece --- /dev/null +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -0,0 +1,146 @@ +{ + addressable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + type = "gem"; + }; + version = "2.4.0"; + }; + backports = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + type = "gem"; + }; + version = "3.6.8"; + }; + ethon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij"; + type = "gem"; + }; + version = "0.8.1"; + }; + faraday = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + type = "gem"; + }; + version = "0.9.2"; + }; + faraday_middleware = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; + type = "gem"; + }; + version = "0.10.0"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; + type = "gem"; + }; + version = "1.9.10"; + }; + gh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2"; + type = "gem"; + }; + version = "0.14.0"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + type = "gem"; + }; + version = "1.7.8"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + type = "gem"; + }; + version = "1.8.3"; + }; + launchy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + type = "gem"; + }; + version = "2.4.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + type = "gem"; + }; + version = "1.11.2"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + net-http-persistent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4"; + type = "gem"; + }; + version = "2.9.4"; + }; + net-http-pipeline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9"; + type = "gem"; + }; + version = "1.0.1"; + }; + pusher-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4"; + type = "gem"; + }; + version = "0.6.2"; + }; + travis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s"; + type = "gem"; + }; + version = "1.8.2"; + }; + typhoeus = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8"; + type = "gem"; + }; + version = "0.8.0"; + }; + websocket = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4"; + type = "gem"; + }; + version = "1.2.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index ed3b99aad0096..2fe1ddf42d439 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 7492acb136782..4cacc75d77768 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap , libnotify}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${udev}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 213b94102b0d7..d8601865c6d14 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig -, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev }: let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index c01c374b5fd96..7fb1289b7ebdf 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "flexc++-${version}"; - version = "2.04.00"; + version = "2.05.00"; src = fetchFromGitHub { - sha256 = "0fz9gxpc491cngj9z9y059vbl65ng48c4nw9k3sl983zfnqfy26y"; + sha256 = "0s25d9jsfsqvm34rwf48cxwz23aq1zja3cqlzfz3z33p29wwazwz"; rev = version; repo = "flexcpp"; owner = "fbb-git"; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 77bc1e5a885fd..8b6b655b6a56b 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }: +{ stdenv, lib, fetchurl, freetype, fontconfig, openssl, unzip }: -assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; +let + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; +in +assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; @@ -27,12 +30,12 @@ stdenv.mkDerivation rec { sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; - buildInputs = if stdenv.isDarwin then [ unzip ] else []; + buildInputs = lib.optional stdenv.isDarwin unzip; - buildPhase = if stdenv.isDarwin then "" else '' + buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${openssl}/lib" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; @@ -60,9 +63,9 @@ stdenv.mkDerivation rec { ''; homepage = http://phantomjs.org/; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ]; + maintainers = [ lib.maintainers.bluescreen303 ]; + inherit platforms; }; } diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 8d9db34446d6f..dd6d75771a32f 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -8,12 +8,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { product = "chromedriver_linux64"; - name = "${product}-2.14"; - version = "2.14"; + name = "${product}-2.21"; + version = "2.21"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; - sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; + sha256 = "1fhwvqjwqkfm18icacvk0312ii8hf1p03icd3isfcxp7j69qf2wg"; }; buildInputs = [ unzip makeWrapper ]; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv chromedriver $out/bin - patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver + patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${stdenv.lib.makeLibraryPath [ cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 2efd85f840101..66d9668fe82d6 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 72af189845145..8def4b6a66577 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { JSONPP TermReadKey ]}" \ - --prefix PATH : "${openssl}/bin" + --prefix PATH : "${openssl.bin}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index f27b9500319e5..4325602425490 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit, pkgconfig, libusb }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb }: + stdenv.mkDerivation { name = "sunxi-tools-1.3"; - src = fetchgit { - url = "https://github.com/linux-sunxi/sunxi-tools"; + src = fetchFromGitHub { + owner = "linux-sunxi"; + repo = "sunxi-tools"; rev = "be1b4c7400161b90437432076360c1f99970f54f"; - sha256 = "0qbl4v66a3mvqai29q2y60zf2b5lj32mh9gyn44gfp0w2bsb10yj"; + sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr"; }; buildInputs = [ pkgconfig libusb ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation { description = "Tools for Allwinner A10 devices"; homepage = http://linux-sunxi.org/; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c113dcbfb7b1e..2284c25cf6615 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # curl: curl, curl-config rm opt/vagrant/embedded/bin/{curl,curl-config} - ln -s ${curl}/bin/curl opt/vagrant/embedded/bin + ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin ln -s ${curl}/bin/curl-config opt/vagrant/embedded/bin # libarchive: bsdtar, bsdcpio @@ -61,8 +61,8 @@ stdenv.mkDerivation rec { # openssl: c_rehash, openssl rm opt/vagrant/embedded/bin/{c_rehash,openssl} - ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin - ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin + ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin + ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin # ruby: erb, gem, irb, rake, rdoc, ri, ruby rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} @@ -80,14 +80,14 @@ stdenv.mkDerivation rec { # libxml: xml2-config, xmlcatalog, xmllint rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2}/bin/xmllint opt/vagrant/embedded/bin + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin # libxslt: xslt-config, xsltproc rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt}/bin/xsltproc opt/vagrant/embedded/bin + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin mkdir -p "$out" cp -r opt "$out" diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix new file mode 100644 index 0000000000000..77bf313e83dc4 --- /dev/null +++ b/pkgs/development/tools/xqilla/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, xercesc }: + +stdenv.mkDerivation rec { + name = "xqilla-${version}"; + version = "2.3.3"; + + src = fetchurl { + url = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz"; + sha256 = "1mjgcyar3qyizpnb0h9lxaj6p9yq4vj09qd8qan1bwv6z6sbjxlg"; + }; + + configureFlags = [ "--with-xerces=${xercesc}" ]; + + meta = with stdenv.lib; { + description = "XQilla is an XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library."; + license = licenses.asl20 ; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 357e77009c4d6..5b9e27b4829f0 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -6,7 +6,7 @@ }: let - binpath = stdenv.lib.makeSearchPath "bin" + binpath = stdenv.lib.makeBinPath ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 629864b6e0b54..ccb5281736777 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -43,13 +43,14 @@ in stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + buildInputs = [ python zlib libuv openssl python ] + ++ optionals stdenv.isLinux [ utillinux http-parser ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional stdenv.isDarwin libtool; + postFixup = '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py ''; - - buildInputs = [ python which zlib libuv openssl python ] - ++ optionals stdenv.isLinux [ utillinux http-parser ] - ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; enableParallelBuilding = true; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 07075571c7e3d..016c965b6c0b1 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -6,7 +6,7 @@ let inherit (xorg) libXext libX11; - lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ + lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; in diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index e2e4f5af977ad..81bdbed46e94f 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; - NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework OpenGL -framework Cocoa"; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 57cd67fbb7baf..82e5ddb06d4d8 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.linux"; - NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; NIX_LDFLAGS = "-lGL"; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index deb7f1709fb3d..4eab8290933e4 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -9,6 +9,9 @@ let dfhack = callPackage_i686 ./dfhack { inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT; + protobuf = with pkgsi686Linux; protobuf.override { + stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; + }; }; dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 9f0d5196b6d90..65eb7d4977139 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; configurePhase = '' - qmake PREFIX=$out + $QMAKE PREFIX=$out ''; # Move layout files so they cannot be found by Therapist diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index d4e637a7caf88..57b0e458cc24e 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index af80467c960d3..f2417428880cc 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" ''; meta = { diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index c9517b22a33b9..cf96756b8b670 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,82 +1,113 @@ { stdenv, callPackage, fetchurl, makeWrapper # Begin libraries -, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi +, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu # Begin download parameters , username ? "" , password ? "" +, releaseType }: -let - version = "0.12.20"; - - fetch = callPackage ./fetch.nix { username = username; password = password; }; - arch = if stdenv.system == "x86_64-linux" then "x64" - else if stdenv.system == "i686-linux" then "x32" - else abort "Unsupported platform"; +assert releaseType == "alpha" || releaseType == "headless"; - variants = { +with stdenv.lib; +let + version = "0.12.29"; + isHeadless = releaseType == "headless"; + + arch = if stdenv.system == "x86_64-linux" then { + inUrl = "linux64"; + inTar = "x64"; + } else if stdenv.system == "i686-linux" then { + inUrl = "linux32"; + inTar = "i386"; + } else abort "Unsupported platform"; + + authenticatedFetch = callPackage ./fetch.nix { inherit username password; }; + + fetch = rec { + url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; + name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help. x64 = { - url = "https://www.factorio.com/get-download/${version}/alpha/linux64"; - sha256 = "1xpzrx3q678519qgjl92fxn3qv55hd188x9jp6dcfk2ljhi1gmqk"; + headless = fetchurl { inherit name url; sha256 = "1hr5dhpfagknjjd47qw3fa3ap8ikjc9hvxavrg4mpslbr0iqww8v"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0vngfrjjib99k6czhg32rikfi36i3p3adx4mxc1z8bi5n70dbwqb"; }; }; - - x32 = { - url = "https://www.factorio.com/get-download/${version}/alpha/linux32"; - sha256 = "1dl1dsp4nni5nda437ckyw1ss6w168g19v51h7cdvb3cgsdb7sab"; + i386 = { + headless = abort "Factorio 32-bit headless binaries are not available for download."; + alpha = authenticatedFetch { inherit url; sha256 = "10135rd9103x79i89p6fh5ssmw612012yyx3yyhb3nzl554zqzbm"; }; }; }; -in -stdenv.mkDerivation rec { - name = "factorio-${version}"; + configBaseCfg = '' + use-system-read-write-data-directories=false + [path] + read-data=$out/share/factorio/data/ + ''; - src = fetch variants.${arch}; + updateConfigSh = '' + #! $SHELL + if [[ -e ~/.factorio/config.cfg ]]; then + # Config file exists, but may have wrong path. + # Try to edit it. I'm sure this is perfectly safe and will never go wrong. + sed -i 's|^read-data=.*|read-data=$out/share/factorio/data/|' ~/.factorio/config.cfg + else + # Config file does not exist. Phew. + install -D $out/share/factorio/config-base.cfg ~/.factorio/config.cfg + fi + ''; - libPath = stdenv.lib.makeLibraryPath [ - alsaLib - libX11 - libXcursor - libXinerama - libXrandr - libXi - ]; +in + +stdenv.mkDerivation rec { + name = "factorio-${releaseType}-${version}"; + + src = fetch.${arch.inTar}.${releaseType}; + + libPath = stdenv.lib.makeLibraryPath ( + optionals (! isHeadless) [ + alsaLib + libX11 + libXcursor + libXinerama + libXrandr + libXi + mesa_noglu + ] + ); buildInputs = [ makeWrapper ]; + dontBuild = true; + + # TODO detangle headless/normal mode wrapping, libs, etc. test all urls 32/64/headless/gfx installPhase = '' mkdir -p $out/{bin,share/factorio} - cp -a bin/${arch}/factorio $out/bin/factorio.${arch} - cp -a doc-html data $out/share/factorio/ - - # Fortunately, Factorio already supports system-wide installs. - # Unfortunately it's a bit inconvenient to set the paths. - cat > $out/share/factorio/config-base.cfg <<EOF -use-system-read-write-data-directories=false -[path] -read-data=$out/share/factorio/data/ -EOF - - cat > $out/share/factorio/update-config.sh <<EOF -if [[ -e ~/.factorio/config.cfg ]]; then - # Config file exists, but may have wrong path. - # Try to edit it. I'm sure this is perfectly safe and will never go wrong. - sed -i 's|^read-data=.*|read-data=$out/share/factorio/data/|' ~/.factorio/config.cfg -else - # Config file does not exist. Phew. - install -D $out/share/factorio/config-base.cfg ~/.factorio/config.cfg -fi -EOF - chmod a+x $out/share/factorio/update-config.sh - + cp -a data $out/share/factorio + cp -a bin/${arch.inTar}/factorio $out/bin/factorio patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/bin/factorio.${arch} + $out/bin/factorio - makeWrapper $out/bin/factorio.${arch} $out/bin/factorio \ + '' + optionalString (! isHeadless) ('' + mv $out/bin/factorio $out/bin/factorio.${arch.inTar} + makeWrapper $out/bin/factorio.${arch.inTar} $out/bin/factorio \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ --run "$out/share/factorio/update-config.sh" \ --add-flags "-c \$HOME/.factorio/config.cfg" - ''; + # Fortunately, Factorio already supports system-wide installs. + # Unfortunately it's a bit inconvenient to set the paths. + install -m0644 <(cat << EOF + '' + configBaseCfg + '' + EOF + ) $out/share/factorio/config-base.cfg + + install -m0755 <(cat << EOF + '' + updateConfigSh + '' + EOF + ) $out/share/factorio/update-config.sh + cp -a doc-html $out/share/factorio + ''); + + preferLocalBuild = true; meta = { description = "A game in which you build and maintain factories"; @@ -94,7 +125,7 @@ EOF ''; homepage = https://www.factorio.com/; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.Baughn ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 86da7686eefd0..42d80f86e8280 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional # Necessary to find libdl. - CMAKE_LIBRARY_PATH = "${stdenv.cc.libc}/lib"; + CMAKE_LIBRARY_PATH = "${stdenv.cc.libc.out}/lib"; # Can't have -werror because of the Vorbis header files. cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON"; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 8d601e29d0b03..7d0f59a4e0d0f 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { -rpath ${SDL_mixer}/lib -rpath ${SDL_net}/lib -rpath ${SDL_ttf}/lib - -rpath ${SDL}/lib - -rpath ${libpng}/lib + -rpath ${SDL.out}/lib + -rpath ${libpng.out}/lib -rpath ${lua5_1}/lib -rpath ${mesa}/lib - -rpath ${zlib}/lib + -rpath ${zlib.out}/lib " ''; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix new file mode 100644 index 0000000000000..434f72d62f0f4 --- /dev/null +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, stdenv, ncurses, autoconf, automake , SDL2, SDL2_mixer }: + +stdenv.mkDerivation rec { + version = "2016-03-03"; + name = "liberal-crime-squad-${version}"; + src = fetchFromGitHub { + owner = "Kamal-Sadek"; + repo = "Liberal-Crime-Squad"; + rev = "39c5f167e902e33cb37b152215d67f71b9ae8269"; + sha256 = "18s2w2570fd79y9rb7ikxls1qw29l1lbwk9n2dxxqjslbzrbvv31"; + }; + + preConfigure = '' + ./bootstrap + ''; + + buildInputs = [ ncurses autoconf automake SDL2 SDL2_mixer ]; + + meta = with stdenv.lib; { + description = "A humorous politically themed ncurses game"; + longDescription = '' + Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil. + ''; + homepage = https://github.com/Kamal-Sadek/Liberal-Crime-Squad; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 532c4c635fb05..ccab07308fd9c 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # To avoid problems finding SDL_types.h. - configureFlags = [ "CFLAGS=-I${SDL}/include/SDL" ]; + configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; meta = with stdenv.lib; { description = "Quick tactics game"; diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix index 55a02e08003d4..a294128969c5d 100644 --- a/pkgs/games/micropolis/default.nix +++ b/pkgs/games/micropolis/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' cd src - sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile + sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm.dev}/include/X11@" tk/makefile sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile ''; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index ecd468eaf5828..04bad7f168421 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype -, gettext +, gettext, doxygen }: let @@ -25,13 +25,14 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" - "-DCURL_INCLUDE_DIR=${curl}/include/curl" + "-DGETTEXT_INCLUDE_DIR=${gettext}/include/gettext" + "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl" "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" ]; buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa - openal libvorbis xlibsWrapper sqlite luajit freetype gettext + openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ]; postInstall = '' diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index e40dec3c23fcc..0bfebd510c940 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -36,14 +36,14 @@ in stdenv.mkDerivation { ''; NIX_LDFLAGS = '' - -rpath ${zlib}/lib - -rpath ${curl}/lib - -rpath ${libjpeg}/lib - -rpath ${libpng}/lib - -rpath ${libvorbis}/lib - -rpath ${libtheora}/lib - -rpath ${libogg}/lib - -rpath ${libmodplug}/lib + -rpath ${zlib.out}/lib + -rpath ${curl.out}/lib + -rpath ${libjpeg.out}/lib + -rpath ${libpng.out}/lib + -rpath ${libvorbis.out}/lib + -rpath ${libtheora.out}/lib + -rpath ${libogg.out}/lib + -rpath ${libmodplug.out}/lib ''; buildPhase = '' diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index d75f02c5e941e..ec9c928b7982f 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,6 +1,8 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal }: +with { inherit (stdenv.lib) makeLibraryPath; }; + stdenv.mkDerivation { name = "oilrush"; src = @@ -25,25 +27,25 @@ stdenv.mkDerivation { do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libNetwork_$arch.so patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtGuiUnigine_$arch.so.4 patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtWebKitUnigine_$arch.so.4 patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libQtXmlUnigine_$arch.so.4 patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ OilRush_$arch ''; installPhase = '' @@ -53,7 +55,7 @@ stdenv.mkDerivation { mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" #! /bin/sh - LD_LIBRARY_PATH=.:${openal}/lib:\$LD_LIBRARY_PATH + LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" EOF diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1926afaeb3b64..1e396318bbbd0 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; + libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ]; in '' mkdir -pv $out/bin cd $out @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { ${if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64" makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib" + --prefix LD_LIBRARY_PATH : "${libPath}" '' else '' patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386" makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib" + --prefix LD_LIBRARY_PATH : "${libPath}" ''} ''; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 2dc4dece75f38..04b74b4214fa3 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z"; }; - NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # The breakpad fails to build on x86_64, and it's only to report bugs upstream cmakeFlags = [ "-DBREAKPAD=0" ]; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 29e13aa810a59..b6acbeb522ab5 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,34 +1,38 @@ -{ stdenv, fetchFromGitHub, qt4, ogre, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal, pkgconfig }: - -stdenv.mkDerivation rec { - version = "0.36.1"; - name = "openmw-${version}"; - - mygui_ = mygui.overrideDerivation (oldAttrs: { - name = "mygui-3.2.1"; - version = "3.2.1"; +{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal +, giflib, pkgconfig }: +let + openscenegraph_ = openscenegraph.override { + inherit ffmpeg giflib; + withApps = false; + }; + openscenegraph__ = openscenegraph_.overrideDerivation (self: { src = fetchFromGitHub { - owner = "MyGUI"; - repo = "mygui"; - rev = "MyGUI3.2.1"; - sha256 = "1ic4xwyh2akfpqirrbyvicc56yy2r268rzgcgx16yqb4nrldy2p0"; + owner = "OpenMW"; + repo = "osg"; + rev = "a72f43de6e1e4a8191643acb26c3e7138f833798"; + sha256 = "04x2pjfrdz1kaj4i34zpzrmkk018jnr84rb6z646cz5fin3dapyh"; }; }); +in stdenv.mkDerivation rec { + version = "0.39.0"; + name = "openmw-${version}"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0yfiilad6izmingc0nhvkvn6dpybps04xwj4k1h13ymip6awm80x"; + sha256 = "0haz8p0hwzgpj634q34if6x57rkc3zsndry5pz4a25m23sn1i72y"; }; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui_ ogre SDL2 unshield openal pkgconfig ]; + enableParallelBuilding = true; + + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; + platforms = platforms.linux; }; - } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 65fab09d04ddf..03f94afd94f25 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq"; + sha256 = "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { prefixKey = "--prefix-dir="; configureFlags = [ - "--with-zlib=${zlib}/lib/libz.a" "--without-liblzo2" ]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index ed682e7bed93d..cf968c08287e2 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f done ''; diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 940351790166d..1b07550779655 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp ''; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix new file mode 100644 index 0000000000000..c4477ab01d9e1 --- /dev/null +++ b/pkgs/games/rigsofrods/default.nix @@ -0,0 +1,40 @@ +{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, + angelscript, ogrepaged, mysocketw, libxcb + }: + +stdenv.mkDerivation rec { + version = "git-20160412"; + name = "rigsofrods-${version}"; + + src = fetchFromGitHub { + owner = "RigsOfRods"; + repo = "rigs-of-rods"; + rev = "1ebd359dbd467b4c3171dd6d054e7d8ec39f78ba"; + sha256 = "0h71nrgq5r5cnh20c7wl8jzyaf50dj1b5jdrwihnklpsfyfvjlw4"; + }; + + enableParallelBuilding = true; + + installPhase = '' + sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg + mkdir -p $out/share/rigsofrods + cp -r bin/* $out/share/rigsofrods + cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods + mkdir -p $out/bin + ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin + ''; + + buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig + libuuid openal ogre ois curl gtk mygui unzip angelscript + ogrepaged mysocketw libxcb ]; + + meta = { + description = "3D simulator game where you can drive, fly and sail various vehicles"; + homepage = http://rigsofrods.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [viric raskin]; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 7d12733284537..e0e6de6b8efe9 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./moderinze_cpp.patch ]; - CPPFLAGS = "-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"; + CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"; buildInputs = [ SDL SDL_mixer autoreconfHook ]; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 15b7f87ed10f9..5e52a92e621a4 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ alsaLib qt48 SDL fontconfig freetype SDL_ttf xorg.libX11 xorg.libXinerama stdenv.cc.cc ]}" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 4bb81d30027e0..7a4fd611b1b4a 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -24,6 +24,8 @@ let which # Needed by gdialog, including in the steam-runtime perl + # Open URLs + xdg_utils ] ++ lib.optional withJava jdk ++ lib.optional withPrimus (primus.override { stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index c4dc96a4c4df8..9ba78c0ab14aa 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_SYSTEM_FFMPEG=1" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; patches = [ diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 2c41a11ab5755..436ac958f3443 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "stunt-rally-${version}"; - version = "2.5"; + version = "2.6"; src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; rev = "refs/tags/${version}"; - sha256 = "1lsh7z7sjfwpdybg6vbwqx1zxsgbfp2n60n7xl33v225p32qh1qf"; + sha256 = "0rrfmldl6m7igni1n4rv2i0s2q5j1ik8dh05ydkaqrpcky96bdr8"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; rev = "refs/tags/${version}"; - sha256 = "1614j6q1d2f69l58kkqndndvf6svcghhw8pzc2s1plf6k87h67mg"; + sha256 = "186qqyr1nrabfzsgy7b4sjgm38mgd875f4c7qwkm8k2bl7zjkrm2"; }; preConfigure = '' @@ -34,5 +34,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + # Build failure + broken = true; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index c1f533276d6e9..1af750f462a9f 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { mkdir -pv $out/res cp -r * $out/res - patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ + patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ --set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \ "$out/res/Tibia" @@ -41,7 +41,7 @@ stdenv.mkDerivation { cat << EOF > "$out/bin/Tibia" #!${stdenv.shell} cd $out/res - ${glibc}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" + ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" EOF chmod +x $out/bin/Tibia diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 22d8c944fa8bf..7cf741f2faba1 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postUnpack = optionalString debug "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; - NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; + NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL"; configureFlags = optionalString debug "--enable-debug"; patchPhase = '' diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index ed2ea23d41580..963dde91068bc 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -12,7 +12,7 @@ let rtdeps = stdenv.lib.makeLibraryPath [ xorg.libXxf86vm xorg.libXext openal ] - + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; + + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ]; buildCommand = '' @@ -20,7 +20,7 @@ let cd $out unzip $src - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) binary=$(find . -executable -type f) patchelf \ --set-interpreter $interpreter \ diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 3eabaa090bb06..5027abedcf4f4 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # The fpc is not properly wrapped to add -rpath. I add this manually. # I even do a trick on lib/lib64 for libgcc, that I expect it will work. preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc}/lib64 -rpath ${stdenv.cc.cc}/lib" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib" sed -i 414,424d Makefile ''; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index bba7823f66302..ea3231dbe63ef 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,26 +1,28 @@ -{ fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis, - asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }: +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image, libvorbis, + bullet, curl, gettext }: stdenv.mkDerivation rec { - version = "2012-07-22"; + version = "2014-10-20"; name = "vdrift-${version}"; - patch = "c"; # see https://github.com/VDrift/vdrift/issues/110 - src = fetchurl { - url = "mirror://sourceforge/vdrift/${name}.tar.bz2"; - sha256 = "1yqkc7y4s4g5ylw501bf0c03la7kfddjdk4yyi1xkcwy3pmgw2al"; + src = fetchFromGitHub { + owner = "VDrift"; + repo = "vdrift"; + rev = version; + sha256 = "09yny5qzdrpffq3xhqwfymsracwsxwmdd5xa8bxx9a56hhxbak2l"; }; - patches = fetchurl { - url = "mirror://sourceforge/vdrift/${name}${patch}_patch.diff"; - sha256 = "08mfg4xxkzyp6602cgqyjzc3rn0zsaa3ddjkpd44b83drv19lriy"; + data = fetchsvn { + url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; + rev = 1386; + sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; }; - patchFlags = "-p0"; - buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost - SDL_gfx pkgconfig bullet curl libarchive ]; + buildInputs = [ pkgconfig scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; buildPhase = '' + cp -r --reflink=auto $data data + chmod -R +w data sed -i -e s,/usr/local,$out, SConstruct scons ''; diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index b525e3cb0f894..9f2dfbab2ecdc 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp -rv basewsw libs $dest # Since 1.03 some modules are _always_ downloaded from server, thus makeWrapper $dest/warsow $out/bin/warsow \ - --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib" + --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib" makeWrapper $dest/wsw_server $out/bin/wsw_server makeWrapper $dest/wswtv_server $out/bin/wswtv_server ''; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index bd94fbecb2ab9..7c578f370d7db 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,25 +1,29 @@ { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng , libtheora, openal, physfs, mesa, fribidi, fontconfig , freetype, qt4, glew, libogg, libvorbis, zlib, libX11 -, libXrandr, zip, unzip, which +, libXrandr, zip, unzip, which, perl , withVideos ? false }: -stdenv.mkDerivation rec { + +let pname = "warzone2100"; - version = "3.1.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; - sha256 = "c937a2e2c7afdad00b00767636234bbec4d8b18efb008073445439d32edb76cf"; - }; sequences_src = fetchurl { url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; }; +in + +stdenv.mkDerivation rec { + version = "3.1.5"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz"; + sha256 = "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1"; + }; buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal physfs mesa fribidi fontconfig freetype qt4 glew libogg libvorbis zlib libX11 libXrandr zip - unzip + unzip perl ]; patchPhase = '' substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ @@ -31,8 +35,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility - postInstall = [] - ++ stdenv.lib.optional withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; + postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; meta = with stdenv.lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { missiles. The game offers campaign, multi-player, and single-player skirmish modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide - variety of possible units and tactics. + variety of possible units and tactics. ''; homepage = http://wz2100.net; license = licenses.gpl2Plus; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 7fb7c11694fd6..e45bbb20d3a71 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { #''; NIX_LDFLAGS = '' - -rpath ${zlib}/lib - -rpath ${libvorbis}/lib - -rpath ${curl}/lib + -rpath ${zlib.out}/lib + -rpath ${libvorbis.out}/lib + -rpath ${curl.out}/lib ''; buildPhase = '' diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index e6686a658a90e..502771e18ee60 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/getline/my_getline/' -i score.c - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm}/include/X11" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXpm.dev}/include/X11" for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done chmod a+rw config.h cat >>config.h <<EOF diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 8feb78ad96933..3a301ed0f2b54 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" - "-DSDL_INCLUDE_DIR=${SDL}/include" + "-DSDL_INCLUDE_DIR=${SDL.dev}/include" ]; - NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ]; + NIX_CFLAGS_COMPILE = [ "-I ${SDL.dev}/include/SDL" ]; preConfigure = '' sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 4373006504194..d140ee4783f0f 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam -, dbus, acl, gmp, darwin +, dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -18,8 +18,11 @@ stdenv.mkDerivation { sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; }; + # FIXME: the cups libraries contains some $out/share strings so can't be split. + outputs = [ "dev" "out" "man" ]; # TODO: above + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus.libs acl ] + ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); @@ -68,6 +71,9 @@ stdenv.mkDerivation { # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint + mkdir $dev/bin + mv $out/bin/cups-config $dev/bin/ + # Rename systemd files provided by CUPS for f in $out/lib/systemd/system/*; do substituteInPlace "$f" \ diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index e4ac510dd148e..3623f78eb200e 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cups, perl, brgenml1lpr, debugLvl ? "0"}: +{ stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep +, brgenml1lpr, debugLvl ? "0"}: /* [Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html). @@ -21,14 +22,11 @@ 1. > Error: /tmp/brBrGenML1rc_15642 :cannot open file !! - This is a non fatal issue. The job will still be printed. However, not sure - what kind of information could be lost. - - There should be a more elegant way to patch this. + Fixed. 2. > touch: cannot touch '/tmp/BrGenML1_latest_print_info': Permission denied - TODO: Address. + Fixed. 3. > perl: warning: Falling back to the standard locale ("C"). @@ -40,6 +38,17 @@ perl: warning: Setting locale failed. TODO: Address. + + 4. Since nixos 16.03 release, in `brother_lpdwrapper_BrGenML1`: + + > sh: grep: command not found + sh: chmod: command not found + sh: cp: command not found + Error: /tmp/brBrGenML1rc_1850 :cannot open file !! + sh: sed: command not found + + Fixed by use of a wrapper that brings `coreutils`, `gnused`, `gnugrep` + in `PATH`. */ stdenv.mkDerivation rec { @@ -55,7 +64,10 @@ stdenv.mkDerivation rec { tar xfvz data.tar.gz ''; - buildInputs = [ cups perl brgenml1lpr ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups perl coreutils gnused gnugrep brgenml1lpr ]; + + configurePhase = ":"; buildPhase = ":"; patchPhase = '' @@ -67,7 +79,7 @@ stdenv.mkDerivation rec { --replace "PRINTER =~" "PRINTER = \"BrGenML1\"; #" \ --replace "\$DEBUG=0;" "\$DEBUG=${debugLvl};" - # Fixing issue #2. + # Fixing issue #1 and #2. substituteInPlace $WRAPPER \ --replace "\`cp " "\`cp -p " \ --replace "\$TEMPRC\`" "\$TEMPRC; chmod a+rw \$TEMPRC\`" \ @@ -78,22 +90,30 @@ stdenv.mkDerivation rec { --replace "/etc/cups/ppd" "$out/share/cups/model" ''; - installPhase = '' - CUPSFILTER=$out/lib/cups/filter - CUPSPPD=$out/share/cups/model - - CUPSWRAPPER=opt/brother/Printers/BrGenML1/cupswrapper - mkdir -p $out/$CUPSWRAPPER - cp -rp $CUPSWRAPPER/* $out/$CUPSWRAPPER - mkdir -p $CUPSFILTER - ln -s $out/$CUPSWRAPPER/brother_lpdwrapper_BrGenML1 $CUPSFILTER - - mkdir -p $CUPSPPD - ln -s $out/$CUPSWRAPPER/brother-BrGenML1-cups-en.ppd $CUPSPPD + installPhase = '' + CUPSFILTER_DIR=$out/lib/cups/filter + CUPSPPD_DIR=$out/share/cups/model + CUPSWRAPPER_DIR=opt/brother/Printers/BrGenML1/cupswrapper + + mkdir -p $out/$CUPSWRAPPER_DIR + cp -rp $CUPSWRAPPER_DIR/* $out/$CUPSWRAPPER_DIR + + mkdir -p $CUPSFILTER_DIR + # Fixing issue #4. + makeWrapper \ + $out/$CUPSWRAPPER_DIR/brother_lpdwrapper_BrGenML1 \ + $CUPSFILTER_DIR/brother_lpdwrapper_BrGenML1 \ + --prefix PATH : ${coreutils}/bin \ + --prefix PATH : ${gnused}/bin \ + --prefix PATH : ${gnugrep}/bin + + mkdir -p $CUPSPPD_DIR + ln -s $out/$CUPSWRAPPER_DIR/brother-BrGenML1-cups-en.ppd $CUPSPPD_DIR ''; dontPatchELF = true; + dontStrip = true; meta = { description = "Brother BrGenML1 CUPS wrapper driver"; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 4c31e8d37d254..779cf9656863f 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -202,10 +202,10 @@ stdenv.mkDerivation rec { cp libs/ThLB* $out/share/ufr2filter ) - patchelf --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/lib32/libcanonufr2.so.1.0.0 + patchelf --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/lib32/libcanonufr2.so.1.0.0 patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/cnpkmoduleufr2 - patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/bin/cnpkbidi + patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/bin/cnpkbidi makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix index d6ce3fbcdc642..b8458ae0af324 100644 --- a/pkgs/misc/cups/drivers/mfcj470dw/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dw/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { --replace expr "${coreutils}/bin/expr" \ --replace rm "${coreutils}/bin/rm" - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1 mkdir -p $out/lib/cups/filter/ ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7118511f16d30..7394daefb7cba 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -4,7 +4,7 @@ }: let - binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ]; + binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; in stdenv.mkDerivation rec { name = "cups-filters-${version}"; diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 2417b0e566de8..2547baec4f12a 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , foomatic_filters, bc, unzip, ghostscript, udev, vim + , foomatic_filters, bc, unzip, ghostscript, systemd, vim , ...}: builderDefsPackage (a : @@ -36,7 +36,7 @@ rec { ''PIXMAPS=$out/share/pixmaps'' ''UDEVBIN=$out/bin'' ''UDEVDIR=$out/etc/udev/rules.d'' - ''UDEVD=${udev}/sbin/udevd'' + ''UDEVD=${systemd.udev.bin}/sbin/udevd'' ''LIBUDEVDIR=$out/lib/udev/rules.d'' ''USBDIR=$out/etc/hotplug/usb'' ''FOODB=$out/share/foomatic/db/source'' diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index ea32287da744e..f264b311dadc3 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 06734d24c8a66..2a9d923f3e8ed 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff index 9d7608b93281e..1ac1b1360b2a6 100644 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -1,26 +1,23 @@ -diff -rupN higan_v095-source.orig/GNUmakefile higan_v095-source/GNUmakefile ---- higan_v095-source.orig/GNUmakefile 2015-11-04 10:28:26.173428178 +0100 -+++ higan_v095-source/GNUmakefile 2015-11-04 10:28:31.752231593 +0100 -@@ -12,7 +12,8 @@ target := tomoko - # console := true - - # compiler --flags += -I. -O3 -+flags += -I. $(CXXFLAGS) -+link += $(LDFLAGS) - objects := libco - - # profile-guided optimization mode -diff -rupN higan_v095-source.orig/icarus/GNUmakefile higan_v095-source/icarus/GNUmakefile ---- higan_v095-source.orig/icarus/GNUmakefile 2015-11-04 10:28:26.186486119 +0100 -+++ higan_v095-source/icarus/GNUmakefile 2015-11-04 10:28:48.755059317 +0100 -@@ -1,8 +1,8 @@ - include ../nall/GNUmakefile - include ../hiro/GNUmakefile - --flags += -I.. -O3 --link += -+flags += -I.. $(CXXFLAGS) -+link += $(LDFLAGS) - objects := obj/hiro.o obj/icarus.o - objects += $(if $(call streq,$(platform),windows),obj/resource.o) +diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile +--- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100 ++++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100 +@@ -36,7 +36,7 @@ ifeq ($(platform),windows) + else ifeq ($(platform),macosx) + flags += -march=native + else ifneq ($(filter $(platform),linux bsd),) +- flags += -march=native -fopenmp ++ flags += -fopenmp + link += -fopenmp + link += -Wl,-export-dynamic + link += -lX11 -lXext +diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile +--- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100 ++++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100 +@@ -40,8 +40,8 @@ cflags := -x c -std=c99 + objcflags := -x objective-c -std=c99 + cppflags := -x c++ -std=c++14 + objcppflags := -x objective-c++ -std=c++14 +-flags := +-link := ++flags := $(CXXFLAGS) ++link := $(LDFLAGS) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 5d48f38abd823..1395e3ac3efed 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -5,18 +5,18 @@ , mesa, SDL , libao, openal, libpulseaudio , gtk, gtksourceview -, profile ? "balanced" # Options: accuracy, balanced, performance }: with stdenv.lib; stdenv.mkDerivation rec { - name = "higan-${meta.version}"; - sourceName = "higan_v${meta.version}-source"; + name = "higan-${version}"; + version = "098"; + sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "0yc5gwg6dq9iwi2qk3g66wn8j2l55nhdb0311jzmdsh86zcrpvqh"; + sha256 = "0qphvjfv17dbmzgb4pny2q6ln0lsgzyhalq6qyqxc3qwm4fzdjv1"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -31,18 +31,17 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - make compiler=c++ profile=${profile} -C icarus - make compiler=c++ profile=${profile} + make compiler=c++ -C icarus + make compiler=c++ -C higan ''; installPhase = '' install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps - install -m 755 icarus/icarus $out/bin/ - install -m 755 out/tomoko $out/bin/ - (cd $out/bin; ln -Ts tomoko higan) #backwards compatibility - install -m 644 data/higan.desktop $out/share/applications/ - install -m 644 data/higan.png $out/share/pixmaps/ - cp -dr --no-preserve='ownership' profile/* data/cheats.bml $out/share/higan/ + install -m 755 icarus/out/icarus $out/bin/ + install -m 755 higan/out/higan $out/bin/ + install -m 644 higan/data/higan.desktop $out/share/applications/ + install -m 644 higan/data/higan.png $out/share/pixmaps/ + cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' higan/data/cheats.bml higan/profile/* $out/share/higan/ ''; fixupPhase = '' @@ -54,21 +53,22 @@ stdenv.mkDerivation rec { cat <<EOF > $out/bin/higan-init.sh #!${stdenv.shell} - cp --update --recursive $out/share/higan \$HOME/.config - chmod --recursive u+w \$HOME/.config/higan + cp --update $out/share/higan/cheats.bml \$HOME/.config/ + cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ + EOF chmod +x $out/bin/higan-init.sh ''; meta = { - version = "096"; description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' Higan (formerly bsnes) is a Nintendo multi-system emulator. It currently supports the following systems: Famicom; Super Famicom; Game Boy; Game Boy Color; Game Boy Advance + WonderSwan; WonderSwan Color higan also supports the following subsystems: Super Game Boy; BS-X Satellaview; Sufami Turbo ''; @@ -82,5 +82,4 @@ stdenv.mkDerivation rec { # # TODO: # - fix the BML and BIOS paths - maybe submitting -# a custom patch to Higan project would not be a bad idea... -# - Qt support +# a custom patch to upstream would not be a bad idea... diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index ea11e3a33e2b2..07470fa54ab49 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, cmake, ffmpeg, imagemagick, libzip, SDL2 +{ stdenv, fetchgit +, pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { - name = "mgba-${meta.version}"; - src = fetchurl { - url = "https://github.com/mgba-emu/mgba/archive/${meta.version}.tar.gz"; - sha256 = "0z52w4dkgjjviwi6w13gls082zclljgx1sa8nlyb1xcnnrn6980l"; + name = "mgba-git-${version}"; + version = "20160325"; + + src = fetchgit { + url = "https://github.com/mgba-emu/mgba.git"; + rev = "be2641c77b4a438e0db487bc82b43bc27a26e0c2"; + sha256 = "0ygsmmp24w14x5fm2qz2v68p59bs2ravn22axrg2ipn5skkgrvxz"; }; buildInputs = [ - pkgconfig cmake ffmpeg imagemagick libzip SDL2 + pkgconfig cmake libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { - version = "0.3.1"; homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; longDescription = '' @@ -38,4 +39,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E AndersonTorres ]; }; } - diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 63b221c9a3dc0..e6a7b9800d31b 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -24,12 +24,13 @@ stdenv.mkDerivation rec { -DCMAKE_BUILD_PO=TRUE \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$out" \ + -DDISABLE_ADVANCE_SIMD=TRUE \ -DDISABLE_PCSX2_WRAPPER=TRUE \ -DDOC_DIR="$out/share/doc/pcsx2" \ -DGAMEINDEX_DIR="$out/share/pcsx2" \ -DGLSL_SHADER_DIR="$out/share/pcsx2" \ - -DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib}/lib/glib-2.0/include' \ - -DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2}/lib/gtk-2.0/include' \ + -DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib.out}/lib/glib-2.0/include' \ + -DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2.out}/lib/gtk-2.0/include' \ -DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \ -DPACKAGE_MODE=TRUE \ -DPLUGIN_DIR="$out/lib/pcsx2" \ diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 35a55a8933ad0..07783d016183f 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -207,7 +207,7 @@ in extraBuildInputs = [ libpng SDL ]; }).override { - patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure"; + patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure"; configurePhase = "./configure"; }; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e031627a032d7..804eb0bb304c5 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,5 +1,6 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, + pkgconfig, fontforge, makeWrapper, flex, bison, pulseaudioSupport, buildScript ? null, configureFlags ? "" }: @@ -14,29 +15,39 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { }) // rec { inherit name src configureFlags; - buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [ - pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison - ]); + nativeBuildInputs = [ + pkgconfig fontforge makeWrapper flex bison + ]; - nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ + buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses + alsaLib libxml2 libxslt lcms2 gettext dbus mpg123 openal ]) ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ (with pkgs.xorg; [ - xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite + libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite libXext ])); # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map - (path: "-rpath ${path}/lib") - ([ stdenv.cc.cc ] ++ nativeBuildInputs); + NIX_LDFLAGS = map (path: "-rpath " + path) ( + map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs)) + # libpulsecommon.so is linked but not found otherwise + ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. dontPatchELF = true; + # Disable stripping to avoid breaking placeholder DLLs/EXEs. + # Symptoms of broken placeholders are: when the wineprefix is created + # drive_c/windows/system32 will only contain a few files instead of + # hundreds, there will be an error about winemenubuilder and MountMgr + # on startup of Wine, and the Drives tab in winecfg will show an error. + dontStrip = true; + ## FIXME # Add capability to ignore known failing tests # and enable doCheck diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 69275a74b3563..206deb01b8bb4 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,32 +1,36 @@ -{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, +{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686, + overrideCC, wrapCCMulti, gcc49, pulseaudioSupport, wineRelease ? "stable" }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { - wine32 = import ./base.nix { + wine32 = callPackage_i686 ./base.nix { name = "wine-${version}"; inherit src version pulseaudioSupport; - inherit (pkgsi686Linux) lib stdenv; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; monos = [ mono ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; - wine64 = import ./base.nix { + wine64 = callPackage ./base.nix { name = "wine64-${version}"; - inherit src version pulseaudioSupport lib stdenv; + inherit src version pulseaudioSupport; + # FIXME: drop this when GCC is updated to >5.3. + # Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140 + stdenv = overrideCC stdenv gcc49; pkgArches = [ pkgs ]; geckos = [ gecko64 ]; monos = [ mono ]; - configureFlags = "--enable-win64"; + configureFlags = [ "--enable-win64" ]; platforms = [ "x86_64-linux" ]; }; - wineWow = import ./base.nix { + wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; - inherit src version pulseaudioSupport lib; - stdenv = stdenv_32bit; + inherit src version pulseaudioSupport; + # FIXME: see above. + stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49); pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; monos = [ mono ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index cd877403d3a00..9ad09ed5dfe1e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.4"; + version = "1.9.7"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm"; + sha256 = "1v47i0pxqcixnh06x23kzp2dbz1cf3d2sric0bw6xqh54ph5yw29"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.44"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0xjxbip0ab1lqgxrww08082ndsb8b5wjfwlf51zlr3f59c9bx9y5"; + sha256 = "1h5hwd07qyx0qw5whf6lcp7v57kqd6mrrcvwwg1bydir68b0zp16"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b219e625033d9..0ad4db976359e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -163,11 +163,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-03-08"; + name = "Syntastic-2016-04-14"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "0f82191a74328ecb618ac74735645fbd1c36d9a1"; - sha256 = "1arai7blnicp28l6z92xzvvrwrblwg0z26lbr92nch4cpzsf1pzq"; + rev = "e879f729d4ca1810debe83c5e6d3986c9dfa586c"; + sha256 = "0h5ini13j7qcambkcl2i7v4rrrw06wh64icywm01s0l24kr00d4q"; }; dependencies = []; @@ -218,11 +218,11 @@ rec { }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-02-13"; + name = "UltiSnips-2016-04-14"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "25882e95cd8981308c4b2d87dcc2c2d6ecd73a6d"; - sha256 = "0bz1qywavysyqb2ni7s9k96pfwdldvhfz79xp5qcw352d1ii7s9n"; + rev = "4c71935cbaf2264c06bf6f9c7384fa2d7cbe83c8"; + sha256 = "0x0n3sc3qzjwn8q22s9kj9v17vl69i95bk7ibz4x76h22hi18xw6"; }; dependencies = []; @@ -240,11 +240,11 @@ rec { }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2016-01-25"; + name = "WebAPI-2016-04-15"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "5726e8270e2a774c7200ca79868b4128c0c57ad7"; - sha256 = "0gfzhny2i6jwkcw5ayhinq0ia3jb086h7bvmxy55lgr0a7ykhvh1"; + rev = "07b727d88314bbd47ae0c92650c25e3c5e671364"; + sha256 = "1676sg82x7df4andz3s4602gficq9rgg9h98y1g90pphzwm7scbw"; }; dependencies = []; @@ -267,11 +267,11 @@ rec { }; commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2016-02-15"; + name = "commentary-2016-03-10"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; - rev = "4dcfc318e0b02fdbb0c2d9ff77cf3562b46eea25"; - sha256 = "1l5krnkx7bx3xry0nj0amwgg6bhqw8ir0jzj75ibvklkg5lmqbxl"; + rev = "73e0d9a9d1f51b6cc9dc965f62669194ae851cb1"; + sha256 = "1cyghdlhyyzl366l8r7a2m00pfnga98n6s6a1z00y4rmnnxbk1kk"; }; dependencies = []; @@ -311,11 +311,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-03-05"; + name = "fugitive-2016-04-14"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "099d65826e0e0863552a92f7e574e3f24c8f4197"; - sha256 = "05ych7091gi1r22n8jkw2hxjyghcmbk0w227311ar3flgar6s197"; + rev = "bdd216827ae53cdf70d933bb30762da9bf42cad4"; + sha256 = "0v72mbhircfm16z7l8hcga4zg6gin9yy468a02biccyk4qbclchx"; }; dependencies = []; @@ -333,11 +333,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-02-29"; + name = "vim-autoformat-2016-04-06"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "36282560c3514453ac2db4d96085e6b6cfdc7a49"; - sha256 = "1ppdy56i7l60x9jd346qqmv3pdx5k2w64gmxl5ah5qvgw2qcaz02"; + rev = "713e7c258052d94dfd752647ea03cf423cace8ff"; + sha256 = "1nwms79m28wp5k53x2x2kzaq16lkzl25z96fqnqin70xh7m7nkbm"; }; dependencies = []; @@ -354,23 +354,34 @@ rec { }; + Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Spacegray-vim-2015-04-04"; + src = fetchgit { + url = "git://github.com/ajh17/Spacegray.vim"; + rev = "1c10d0da045609910e8fb03b33c043bbcff35d9e"; + sha256 = "1ddlnjgizma1kavr06q6x1kasv9219by540b6n22z94waf3qkvdw"; + }; + dependencies = []; + + }; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-03-07"; + name = "vim-css-color-2016-04-14"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "81ce9558b0f5c8f0b015042415566f02360c67d0"; - sha256 = "04if4ch5db7lkh0swb9rwqpqzk2k8kkc6aszy4bvqg08irk4lqsi"; + rev = "4421dbac36bedcdd4fc345fd95785cfed518847c"; + sha256 = "11f356rciyxxvdlcijiq5rz2w8vmbcczq32r1fgspaig4pfa933p"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-02-20"; + name = "neomake-2016-03-09"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "645c433b73f527badaac5e315f1ea16e7d34ef99"; - sha256 = "0vprly61xhl7pqqp8nfr8vanl6ddq7kf5asqz4kpfdpgnbdxrdlc"; + rev = "efed015f59001b2cf28e95bff24e87ff5764a62b"; + sha256 = "129jhzmwk2y7fnkzh4l54dx7vavc4bzd59bm5r9d34k9d0yzz1jm"; }; dependencies = []; @@ -399,11 +410,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-03-09"; + name = "ctrlp-vim-2016-04-12"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "0853394bee04fef74d96e536985765ea16c61b27"; - sha256 = "1ylh978kh6c6hznp20db9dmx4q6xmgb98j6lj227blc2936pg5fx"; + rev = "d00960b4f34bc45b5f88d9363a768bcce5ac3933"; + sha256 = "12yhvhdzaijgy8s6br2s1ng7jh01h2nblb6yqfrmcapjin34iwlk"; }; dependencies = []; @@ -421,11 +432,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-03-04"; + name = "neco-ghc-2016-04-15"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "df959a20468c2f455b599d1d21de8d2c4334c7aa"; - sha256 = "16gnrg8sa5d3w1lg0bsx24cbvyb9pfgkm67rgnxr39g8b9h9pr09"; + rev = "3a413c1c059e0bc47f11d863f52af06cd858791c"; + sha256 = "0bx8fp95ybsbrn5jxnf2xaq55igi2hckg33jg42qw67gc6090bcr"; }; dependencies = []; @@ -443,22 +454,22 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-03-03"; + name = "vim-go-2016-04-15"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "fd5661a1e16a1fd41385d7011877bfa1f0a1353f"; - sha256 = "1ps6hmzad0pmr8amk5knhrmc7giww7586pr2j36f6h60wzjvxgnn"; + rev = "b3fddb60fdab980d1fc339fbcbc879abd6cbf524"; + sha256 = "1ggjisbc187kyzdizqffkicjdkz67mhgpxmqjcvzaq2wc2w44aja"; }; dependencies = []; }; vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2016-03-09"; + name = "vim-colorschemes-2016-03-18"; src = fetchgit { url = "git://github.com/flazz/vim-colorschemes"; - rev = "93593970393b0b14d9ee1ac963bea8db2ae30481"; - sha256 = "1wq4pzfgd8scx8slmaz3l3ab9hsp286v6rydhw8ydp7wwi6ixpnr"; + rev = "189f5182bb70fd35d0f56fee451c3f22a2a80135"; + sha256 = "0wv12f6i07md9c53ygbmyh14zghsr7w9ylkbrfpdjm9z32b0fpwf"; }; dependencies = []; @@ -469,7 +480,7 @@ rec { src = fetchgit { url = "git://github.com/google/vim-jsonnet"; rev = "5d59d0ba6af2bca4484909e02d72c96fbdd5b220"; - sha256 = "eb7508aedce86bdcb7f104f62490b92bea6e23fb14fafacd251c6aab80aece78"; + sha256 = "0y6fms0anshw4p6zmyhlzcinxsibp6829xh4y6vxqsz8vjp0hxgb"; }; dependencies = []; @@ -487,22 +498,33 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-03-06"; + name = "calendar-vim-2016-04-10"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "b2bbf257fbcb71a7854daaa99aa8cd7f15709df5"; - sha256 = "1w1w8s90l0hs65sp69a7w6wq63281lpksn459zy21i7zhflnl57l"; + rev = "d6bba38a73a6e73bed866664df21f422f97cc3fe"; + sha256 = "05gph8mf1n3d2b7p7qlvwqk618h1mnf9pg04y1p66anyy4rlsnyy"; + }; + dependencies = []; + + }; + + lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "lightline-vim-2016-04-15"; + src = fetchgit { + url = "git://github.com/itchyny/lightline.vim"; + rev = "ec7d944f06821f96461fc0ba81aebf1dc650cded"; + sha256 = "0yvjsvkql999cldlq7xhy873mk42awh3xsh9ihfs5rbaj1v27z4p"; }; dependencies = []; }; thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2016-02-16"; + name = "thumbnail-vim-2016-03-17"; src = fetchgit { url = "git://github.com/itchyny/thumbnail.vim"; - rev = "3d404c89c7ea783c8386c2e1f03086373f764387"; - sha256 = "02wz7832kyrmwsfpniahpn3b1q1nw5h29zq0l3kj7n19xh5ighm1"; + rev = "4afdc473b47d162610965fa5ed15fa855cca65d4"; + sha256 = "1fcyjw1dvkpijlcm2lbg81am6h188p1bmi3md6wvk48vdj2h56r5"; }; dependencies = []; @@ -530,12 +552,23 @@ rec { buildInputs = [ vim ]; }; + vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-orgmode-2016-04-11"; + src = fetchgit { + url = "git://github.com/jceb/vim-orgmode"; + rev = "0bb1eff513880b90dd2c3ecde3726c21863cb4d9"; + sha256 = "07gw5d5gipmcsa9cqii2n2cqghdny22m37z2dllm8n82j9yk1qzg"; + }; + dependencies = []; + + }; + vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2016-01-21"; + name = "vim-buffergator-2016-04-07"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "9a6a946a41bcf492dfe8da5eee4cc2ee3d55c77f"; - sha256 = "1vng1hjgw3r6cpbdn54ba0prxfl08d9q1v9n65mskxs2zfzx3wvd"; + rev = "611966d1ced784d5659c5dc07e984fabd95d917f"; + sha256 = "1fypzqwl89gk024742d59d0ax9wl2xv40bpfmby0cnh1f5hqias3"; }; dependencies = []; @@ -568,7 +601,7 @@ rec { src = fetchgit { url = "git://github.com/jnurmine/zenburn"; rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179"; - sha256 = "05d7c348dfaf70b8068abb3eaba3bc961b060e4d7a4c99fb6c4538fba5085ad1"; + sha256 = "1las12jznf25dkxrjk3s9l70c6wnpjisngmvi83bhw5gvx4c7mq5"; }; dependencies = []; @@ -597,11 +630,11 @@ rec { }; limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "limelight-vim-2015-08-19"; + name = "limelight-vim-2016-04-12"; src = fetchgit { url = "git://github.com/junegunn/limelight.vim"; - rev = "153e3f7b78484eb4f5d69833ebf628f44b94996d"; - sha256 = "1zdmivr5rn7lswsbgysdqpjv5kz1b97svx8xisw718aizn6ii9c5"; + rev = "be8c754eb1cc947521831d0d2e2fb9da5420d57a"; + sha256 = "1nhk4rmpfbp1q9rbihz014v7mk4ai4zpk88k3dmj6ymvmmxj2ayh"; }; dependencies = []; @@ -652,22 +685,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-03-08"; + name = "vimtex-2016-04-14"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "4ecf478faf24158839e0b6fcf4fd301a9128103e"; - sha256 = "04vb121c109h02393z7hr1kiy2bc02aa8lqfwwh57wx7mzxjsfs5"; + rev = "270eb339ea67ac08622b5e386490bf09be6e0190"; + sha256 = "1bdznp73q989ha0ws8kzq92dcbmg2nn8b4nkx4hzcin56n8bx4x4"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-02-15"; + name = "vim-easymotion-2016-03-27"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "649120e90e92bc2ae5361693fa1e4dd2d02c1822"; - sha256 = "1anh1yflahbsmw3zmgm9xzvpz3c4jh1crk695a6p2sjvf3rr68av"; + rev = "a6b3c10b417d90d6751352b53826f94062ff466d"; + sha256 = "0f9jdc9czhw14wr0hs1acdf779lx7v5a5hjbf19rw80bb6sp7f3b"; }; dependencies = []; @@ -689,22 +722,22 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-03-07"; + name = "vim-startify-2016-03-24"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "193e0802ecde996a00ed58248d17a0e99ab077af"; - sha256 = "1zkqxhvc1cvsdgk5il38fxjcgds3x1fql2fjfn8v72rna1075xks"; + rev = "e74cc71b1b7b33f6df6e8b48ff4b0f587f6bfed9"; + sha256 = "1dimkqzmcw8w10wf75b10bvmskyf9ahxxiyvac4kbr7bipmzz1b3"; }; dependencies = []; }; lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2015-06-06"; + name = "lushtags-2016-03-24"; src = fetchgit { url = "git://github.com/mkasa/lushtags"; - rev = "3d7229b07b47ab2fc188d7db63b33dfcd63a1802"; - sha256 = "1f87zjs9d03h3g4r93ad4asdyx5jsx7nyzf5al72s855adxypdpm"; + rev = "f54dd9b2819a5573f110099b232149c5202c1eb4"; + sha256 = "15v2f58i1z3421rgxh1i5rbd6cgc4s3vljv1bdjx19b2x9fq237f"; }; dependencies = []; @@ -744,66 +777,66 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-03-09"; + name = "vim-racer-2016-03-29"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "263d3f48ff96c0e8f347f660f97edca13ea36405"; - sha256 = "0aak5jhzps173k52ql6isdwhjhmp69bnzzjrqjqnriyy0xay2d38"; + rev = "54f10ee0016f90167e4ff9acaca9beaf8c3b85b5"; + sha256 = "0gpm8h3wqsncyy8ldgwsyk7b70b4j0ia3632h5f3pchq7pb46h8g"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-03-01"; + name = "neocomplete-vim-2016-04-06"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "a21f22f19d6dbd0fb0d58b555c186138c4c9cfc9"; - sha256 = "1kqg747s3pw6gc8g6h3s3bcsc3vjn00gav29zms6hpywiz6x931x"; + rev = "738bf323deaa844f9bd45c9a65d99699e73cd772"; + sha256 = "15nbykpp8mshmxb1dfb256yx0k4296arahz97f2x6wm6x44g8yns"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-03-05"; + name = "neosnippet-snippets-2016-03-21"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "65810a15db3f09384d62ddcd42d9f97dcb96dde9"; - sha256 = "1zqw8mkljzq5mknridxp77gwfbhn2wrz8czhjlgg8k4q8alyziqp"; + rev = "1cd353ac0d0e9ad0eba9d57e3eda34b3abefd7ff"; + sha256 = "066svirnvz35bz1hi23ffqsa208l467lsld0jg7yzmh8gvfi32jb"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-03-05"; + name = "neosnippet-vim-2016-03-30"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "bcb7620a852a542d0940a2ff691deb9da9309f07"; - sha256 = "06f6flbv4zbdckjxchfwhm36syma6bzywassrf7hachnsx0s3ys3"; + rev = "ce3c3d209c38a6d87bbf1408d293e179f95e7bb8"; + sha256 = "0lp1p8vwnnwrnhiivzzzd0688vivyxqjgl75piq0xfw24v9ncgcf"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-03-06"; + name = "unite-vim-2016-04-15"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "c9d2ced6b993653a7ebbc572039f8d03ba2b997f"; - sha256 = "1b444a6zls7n321s03cljzv35id2rhp3aflpngyxk6l3j3ml2shx"; + rev = "21b6c8846b4c8fb62761e1470cbad8d2fc08ce6c"; + sha256 = "15h835401ki6phnxcmh6w8prkfdf37qdq0rc64dslg5jv3cw3b0r"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-03-09"; + name = "vimproc-vim-2016-04-10"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "3ab0a236e65b277670266c1187da9a49064c1500"; - sha256 = "0vwrlds6dhvrq2sv2g2041cw1jx3c3snsv5pnlnma3nflxpxvry0"; + rev = "b05d30228ecb97acc2b398cca34b230092722268"; + sha256 = "0r27652gpqrb8p552yansvdvw703bpd9i67lzs3i11mp1gd5krrd"; }; dependencies = []; buildInputs = [ which ]; @@ -818,11 +851,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-03-05"; + name = "vimshell-vim-2016-04-04"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "ce19571a937c9cfa9d5c993c9c06c1457376759e"; - sha256 = "03fvzi4dlg7irljywy1kikkvq4sd4rnvvf8ji2pv68dl8s3zwmr2"; + rev = "bdcd197b701734a743903c7547e9f56842701614"; + sha256 = "04b4kzjg0b8blfqcc21vvn7myq9g7iyn2zy1ypiil64bbch1aw3p"; }; dependencies = [ "vimproc-vim" ]; }; @@ -839,22 +872,22 @@ rec { }; vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2016-02-17"; + name = "vim-hardtime-2016-03-28"; src = fetchgit { url = "git://github.com/takac/vim-hardtime"; - rev = "7c6a6ec70a1f8a1f8c3ccd21041f84375eb4c160"; - sha256 = "129pwjb3sjz4bffa5cysmk4gy5xd22na4i84ackwx77sw7n6y9kv"; + rev = "9764bc446dc2a917583e29c5dc58eac3f2c1f80d"; + sha256 = "1yk4452lb19s04184h58562rmkbbyb4w02h5ay3j4da3gc0j1fml"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-01-27"; + name = "vim-quickrun-2016-03-27"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "ac9f4be0698dffb30ebdf284f8ba5abbaab5eaca"; - sha256 = "1g8s4h2a9iiq7d0j99ajqkl562m1w0vwa73riiz7axdmjz34vjwl"; + rev = "5e3d1c94f0deee5b4e0c7630e7b7362213d9fda7"; + sha256 = "0lzvfxsvq1c85h7ym87yjx71w4pissd68hgfn3w2nwyl7zj4d91s"; }; dependencies = []; @@ -872,11 +905,11 @@ rec { }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2016-02-07"; + name = "vim-eunuch-2016-04-13"; src = fetchgit { url = "git://github.com/tpope/vim-eunuch"; - rev = "d02b2d0404134e6cae2708069d6888110d3c2272"; - sha256 = "07xbrx5wrcrv19yaxmnbl7h2qz80f04kmlsz60pag84pyqlina0h"; + rev = "07ca4836c5f0b325ebb4d706f94a14eb8c722f51"; + sha256 = "0im8fkw313z3hzhpz5wan8lj1ka6d2vx70ngg9anipwyx0lvl5q3"; }; dependencies = []; @@ -905,11 +938,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-03-10"; + name = "youcompleteme-2016-04-10"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "f44435b88ec98156d17869aa67ad15f38cfecbf3"; - sha256 = "1y50ilyfwj6rvpvg50iq418maxvsfs54i202v7x0lfs5hmvcb4hi"; + rev = "f67033c990ff5d37ef91ba02da94f6d7409e1c5a"; + sha256 = "0hwpbj5hr9d26xdcjfxbssyrsl4926c8g999jzpah0sls1r3y2f0"; }; dependencies = []; buildInputs = [ @@ -940,23 +973,34 @@ rec { }; }; + vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline-themes-2016-04-14"; + src = fetchgit { + url = "git://github.com/vim-airline/vim-airline-themes"; + rev = "60105c7e8827623f646b9b030a68026cddee3d19"; + sha256 = "1xs30363797l4f5n56d0f4f35bgkpq00fv3j9jbcz0nj0cjwik2v"; + }; + dependencies = []; + + }; + vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-02-12"; + name = "vim-pandoc-2016-04-06"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "ff604abdf48e98dd4bd0c441429b9f8f9413134c"; - sha256 = "1c9m1p9zyxqxcrmpn24lkhx1jr6mx51qdvp5wj1vkqwbs811ps26"; + rev = "c08a9205ad6960ac1b0931acc9742ac1fa6ce58c"; + sha256 = "0k4hbxblw3jwm0hl222alg2f0z0ar3lkphydqrnqgckcm3cgzpdy"; }; dependencies = []; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-03-08"; + name = "vim-pandoc-syntax-2016-03-20"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "a7783e5834008c4bec3f38b78bd2e48e113c9d4c"; - sha256 = "0hzgnyjscljylgv4ss5w1hfff1mdl4kdpl0gm7yrl964rlifcgzg"; + rev = "a35e9ce28bae85b1ce5d4f817882a8d78efcd6be"; + sha256 = "1d3yw2v9giw2nyk4yb8qdav42wki81g8nzn3dz3rzb6dqq1k3skv"; }; dependencies = []; @@ -1040,22 +1084,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-03-06"; + name = "vim-wakatime-2016-03-21"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "115b02198233745c86ef453b5cf5f8fc2d493ae0"; - sha256 = "1jbwjg3fk59dkz6f7x8cyqgxh1cg0a3qy3aj7abg4k2aip67101y"; + rev = "def34fb17502e555ac9b70348640c4614779bfff"; + sha256 = "0m3dgs4jf2q0kn2b4rff0j2kaf2030h7ixsn5ab54xdlgfdn6z7n"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-03-09"; + name = "command-t-2016-03-12"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "9740c9cd318d4e004f330358c76a27948dc5779e"; - sha256 = "0wb6wabd758xzh722d2vs3hrx77gf2sh24g9fnrzj4hwwglrld1s"; + rev = "2d80b2e65cd690dd17c66fb52e5f9fb09700b1e7"; + sha256 = "1ndzjsrf2nz7gaq6q58p4pna82a4zbirclyjkgzg6a58qinhm3pi"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1068,11 +1112,11 @@ rec { }; goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2016-02-15"; + name = "goyo-2016-04-03"; src = fetchgit { url = "git://github.com/junegunn/goyo.vim"; - rev = "cb697998cce4d5a50fb1749310147ae16b0d70e6"; - sha256 = "0sbyk5byfsf10n93dk043ysyxfm43rabiw766pb1gkng5hdqypd0"; + rev = "8e8f1d45b61e1fce7f84ee061c38f9e033e86ff9"; + sha256 = "0q3in448s99df4dls4vlfsnh15q9rargsb68axj4z5z0jdkncpwi"; }; dependencies = []; @@ -1145,11 +1189,11 @@ rec { }; sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2016-02-09"; + name = "sensible-2016-03-18"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; - rev = "2fb074e84169e177045e8bdb6ceb7eded3a80e8f"; - sha256 = "067ccar0adk2rx96ci26ykdi6bk0p4wnsd10la088lxdfva00m90"; + rev = "9e91be7e0fb42949831fe3161ef583363648aa58"; + sha256 = "1g1l3v33g9229r4g4kcx8m1yrh397yf3fn6bxis57n3lg6lmb6wm"; }; dependencies = []; @@ -1167,11 +1211,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2016-03-01"; + name = "snipmate-2016-04-04"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "71250b0ef2b03b40ded5e93f4abe66fc2ee4aa75"; - sha256 = "0nzpk9h31m73anb16hj19mp8q9ccq8aqgck482alxapgf1g0mzli"; + rev = "66555c2a86ba2136459190c06aa2c0f25ad38bb3"; + sha256 = "01dnscgnkjy8q5ajnxsaxi1zn97v1fbhr4q5sjdqazdis9zxlqq2"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1200,11 +1244,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2015-12-03"; + name = "table-mode-2016-04-09"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "2ab64777a5b81e240810999eb6e7dc65e1de5461"; - sha256 = "1qd80k0xwvd45kn3cb9ripzf8xhmgs32247lgh46ysgb18ygdbv4"; + rev = "4cf1f534307fc2c89b63075bd6b36b3ee352fdbb"; + sha256 = "0amjlb4im19irahlqmp6pmcyjdy0ndiyrgrm0jm6k9iv74arhg8r"; }; dependencies = []; @@ -1232,11 +1276,11 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-01-26"; + name = "tlib-2016-04-06"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "9734d8d9e4f7b7b91272123463a62759aef31556"; - sha256 = "19dqzxy1v3wg1n8b93wjds311w3lw70g49svv59sr070s7bwl6z9"; + rev = "34b13299b5da7ad66ea387027d458bd54127687c"; + sha256 = "18jhq6m25qv0cfm5iyxi268x1cww6xi5p4hx4c48fsq919bk6k8f"; }; dependencies = []; @@ -1463,26 +1507,16 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-03-08"; + name = "vim-airline-2016-04-12"; src = fetchgit { - url = "git://github.com/bling/vim-airline"; - rev = "4395405628534b2c7f9c4be2bdba03315241393c"; - sha256 = "1fgq9jjdlmrak663iw7xbx348l7zz5jsx477n7l3s338wj4h9bsb"; + url = "git://github.com/vim-airline/vim-airline"; + rev = "1bb8b6278e901cbc282535cabb1f6e17f8059e2a"; + sha256 = "10vlbv9p6zcibvxyjkgf03v8720j8zryl9s7kq0hj0h2z646kdw8"; }; dependencies = []; }; - vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-02-24"; - src = fetchgit { - url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "13bad30d4ee3892cae755c83433ee85fbc96d028"; - sha256 = "0w36ani4r2v58pd0fcqv12j0hjd97g2q78zici1a72njvwp9qhgj"; - }; - dependencies = [ "vim-airline" ]; - }; - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-coffee-script-2015-04-20"; src = fetchgit { @@ -1506,22 +1540,22 @@ rec { }; vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2016-03-02"; + name = "vim-gista-2016-04-11"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; - rev = "9b6719242c0dfbb8b01a49b8765fc8dfeb022118"; - sha256 = "0kl1f2w8pvmx3jkiwq2ygrdq9yccxnh9kl0fwjwjp5gqhhw0d2vp"; + rev = "7ff4d24f242d406ff71d9a65691357aee80f37f7"; + sha256 = "0hm4lnf2mxvdvc13b67cwvyp7griir5lpacnb1sgjx4dxr0w4fzz"; }; dependencies = []; }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-03-07"; + name = "vim-gitgutter-2016-03-29"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "28353bd0609ae7b8c7e01c70dce31700d8c6e654"; - sha256 = "04dmbqpmk3da3wnklzv3ws0r3fjd55yc8z2j5f695x60f2cab8qz"; + rev = "78d83c7056e1973ed4cbf9b5b3f09263a3dbf968"; + sha256 = "0gslmjizqaaa4fhcbdmrw2yvl70s06b3hwvjsx2zw7mlnj66lakv"; }; dependencies = []; @@ -1539,55 +1573,55 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2015-05-11"; + name = "vim-latex-live-preview-2016-03-16"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "7695dd4ebddb735bec632d468e2202d070029cb8"; - sha256 = "1j5z0n5j6gk25hh99pb0xyhqv9yjbjnmpqz6vig7zc4q9alf4l9m"; + rev = "99501642c1dd3f703ac6301ae13469f4990b7a06"; + sha256 = "0dkm3v1jqi8aq0jfpa6fdwgbfbwidc32ci1y9vhqb1prs15qrqfl"; }; dependencies = []; }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2016-01-28"; + name = "vim-multiple-cursors-2016-04-11"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "47c9e3fb11a202a9a2fa1d591ec990a41e4221c4"; - sha256 = "006wj5jikdkz9zilhy9q55hr50v6x34z27jpn0dv9shgaj8xf62s"; + rev = "25b567baf712a7e9bc8f3c9ca816bd579363109b"; + sha256 = "1jvg5i76k58sz56z615pb7s7gg7jn0dpwf7rr76v22v4zpyij70h"; }; dependencies = []; }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-03-03"; + name = "vim-signature-2016-04-10"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "85b22e21ad4276c54d557ac640e1d32b2b4e6b5e"; - sha256 = "1rygsgahcf9lbi0ddk3f2srda3mlmhnwpal842bms60crj9jimxk"; + rev = "31028e7a0d015b04a51e721af155fd11d1b6ac76"; + sha256 = "1f78ipkfnhmlhw88ii6rqxwfm7qpdc1c8v2716il240bk08khkff"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-03-03"; + name = "vim-signify-2016-04-08"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "a02c8793bfda7ddd386587c64246bec6aa78ff62"; - sha256 = "0lv37z8zcwz3fvlc6qjg8nbmgqkall776w46ifps51pn03qwp91d"; + rev = "37376d9970294063b2ba9594204d50cfa181ebb6"; + sha256 = "0ih09i0smn768fkbzbjpfzsjfsm4w653ghaykzcn4hbail67nx84"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-03-09"; + name = "vim-snippets-2016-04-13"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "743be1a6e0c93e84a7ae6bc7066bf6ed358b5fbe"; - sha256 = "0p0ld2m0mka5kq324vs0k3m7ffpvjg7kjh5vdqz9cm0ajmw3aa8p"; + rev = "e055cf9a71e52690a6fd5b4d0b145672950aa423"; + sha256 = "0d0dzhlngpzgwz6d21qdfmc4b9nl8zlhkm861y0fkxr81y6mvp80"; }; dependencies = []; @@ -1616,11 +1650,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2015-12-10"; + name = "vimwiki-2016-03-31"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "3bd3d9b86036b21aecd69f0a1e572643d626c280"; - sha256 = "1j6mmdzpg7jfyv6fvfxb25j71pzf1il6dmzz86h1f3dgh4waw43s"; + rev = "129c2818106bdb9230bbd99ee8eb81fa47c7a414"; + sha256 = "16qq2c2vwc3yndmv2qd9vb2krrx3drwk4ylql49wf04h8sdshfsp"; }; dependencies = []; @@ -1648,24 +1682,4 @@ rec { }; - lightline-vim = buildVimPluginFrom2Nix { - name = "lightline-2016-02-10"; - src = fetchgit { - url = "git://github.com/itchyny/lightline.vim"; - rev = "e6a43f98fab1ee2e373bd0b670803222607ed123"; - sha256 = "abb836d728a8f674f3aa71c4936798c9be02bb352ca0e6e5f5b262886622ac3b"; - }; - dependencies = []; - }; - - Spacegray-vim = buildVimPluginFrom2Nix { - name = "spacegray-2015-04-05"; - src = fetchgit { - url = "git://github.com/ajh17/Spacegray.vim"; - rev = "1c10d0da045609910e8fb03b33c043bbcff35d9e"; - sha256 = "bced8987539ca42f84350b90e2570a226dad66e8061b90b79a41d51f9fb4b4b5"; - }; - dependencies = []; - }; - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 69a6682e691cd..5102d6cde1ceb 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -35,10 +35,11 @@ "github:google/vim-jsonnet" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" -"github:itchyny/thumbnail.vim" "github:itchyny/lightline.vim" +"github:itchyny/thumbnail.vim" "github:ivanov/vim-ipython" "github:jceb/vim-hier" +"github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" "github:jistr/vim-nerdtree-tabs" @@ -73,6 +74,7 @@ "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" +"github:vim-airline/vim-airline-themes" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" @@ -91,7 +93,6 @@ "rainbow_parentheses" "rust" "sensible" -"sensible" "sleuth" "snipmate" "sourcemap" @@ -115,7 +116,6 @@ "vim-addon-toggle-buffer" "vim-addon-xdebug" "vim-airline" -"vim-airline-themes" "vim-coffee-script" "vim-easy-align" "vim-gista" diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index d72afac88feea..b8b436efe24f9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -73,12 +73,15 @@ in appleDerivation { install -d 0755 $ps/bin install ps $ps/bin/ps + touch "$out" ''; outputs = [ + "out" "ps" "locale" ]; + setOutputFlags = false; # ps uses this syscall to get process info propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port"; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index abe4aa67b143f..d671c7c723038 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # FIXME: this will give us incorrect man pages for bits of cctools ln -s ${binutils-raw}/share $out/share - ln -s ${binutils-raw}/lib $out/lib + ln -s ${binutils-raw.out}/lib $out/lib ln -s ${cctools}/libexec $out/libexec ''; diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index a2408bfc5c8a1..1cd7f2bf9d6e1 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--with-uuid=${libuuid}" ]; - buildInputs = [ icu tzdata.lib ]; + buildInputs = [ icu tzdata.dev ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index c4fd46b3c7da2..d2637f99119cf 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h ''; + outputs = [ "dev" "out" ]; + crossAttrs = { patchPhase = '' sed -i s/extern/static/g include/iatomic.h diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 64c6f66575b63..f90601073406a 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, makeWrapper, autoconf, autoreconfHook, automake, libtool, pkgconfig, perl, which -, glibc, flex, bison, python27Packages, swig, pam +{ stdenv, fetchurl, makeWrapper, autoreconfHook +, pkgconfig, which +, flex, bison +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, pythonPackages +, perl +, swig +, pam }: let @@ -8,7 +14,7 @@ let apparmor-meta = component: with stdenv.lib; { homepage = http://apparmor.net/; - description = "Linux application security system - ${component}"; + description = "A mandatory access control system - ${component}"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; platforms = platforms.linux; @@ -22,7 +28,7 @@ let prePatchCommon = '' substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" - substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; @@ -30,28 +36,27 @@ let name = "libapparmor-${apparmor-version}"; src = apparmor-sources; - buildInputs = [ - autoconf - automake + nativeBuildInputs = [ autoreconfHook bison flex - glibc - libtool - perl pkgconfig - python27Packages.python swig which ]; + buildInputs = [ + perl + pythonPackages.python + ]; + # required to build apparmor-parser dontDisableStatic = true; prePatch = prePatchCommon + '' - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" - ''; + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" + ''; postPatch = "cd ./libraries/libapparmor"; configureFlags = "--with-python --with-perl"; @@ -63,13 +68,13 @@ let name = "apparmor-utils-${apparmor-version}"; src = apparmor-sources; + nativeBuildInputs = [ makeWrapper which ]; + buildInputs = [ perl - python27Packages.python - python27Packages.readline + pythonPackages.python + pythonPackages.readline libapparmor - makeWrapper - which ]; prePatch = prePatchCommon; @@ -79,7 +84,7 @@ let postInstall = '' for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python27Packages.python.libPrefix}/site-packages:$PYTHONPATH" + wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" done for prog in aa-exec aa-notify ; do @@ -94,17 +99,14 @@ let name = "apparmor-parser-${apparmor-version}"; src = apparmor-sources; - buildInputs = [ - libapparmor - bison - flex - which - ]; + nativeBuildInputs = [ bison flex which ]; + + buildInputs = [ libapparmor ]; prePatch = prePatchCommon + '' substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" - substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" ## techdoc.pdf still doesn't build ... substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" ''; @@ -119,12 +121,9 @@ let name = "apparmor-pam-${apparmor-version}"; src = apparmor-sources; - buildInputs = [ - libapparmor - pam - pkgconfig - which - ]; + nativeBuildInputs = [ pkgconfig which ]; + + buildInputs = [ libapparmor pam ]; postPatch = "cd ./changehat/pam_apparmor"; makeFlags = ''USE_SYSTEM=1''; @@ -137,7 +136,7 @@ let name = "apparmor-profiles-${apparmor-version}"; src = apparmor-sources; - buildInputs = [ which ]; + nativeBuildInputs = [ which ]; postPatch = "cd ./profiles"; installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles''; @@ -153,7 +152,7 @@ let installPhase = '' mkdir "$out" - cp -R ./kernel-patches "$out" + cp -R ./kernel-patches/* "$out" ''; meta = apparmor-meta "kernel patches"; diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 377297feaf757..78903da1f1a1f 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -85,15 +85,17 @@ stdenv.mkDerivation { inherit glibc /* glibc only used for setting interpreter */; + # outputs TODO: probably many fixes are needed; + # this in particular would be much better by lib.makeLibraryPath LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" - [ "${xorg.libXrandr}/lib/" - "${xorg.libXrender}/lib/" - "${xorg.libXext}/lib/" - "${xorg.libX11}/lib/" - "${xorg.libXinerama}/lib/" - "${xorg.libSM}/lib/" - "${xorg.libICE}/lib/" - "${stdenv.cc.cc}/lib/" + [ "${xorg.libXrandr.out}/lib/" + "${xorg.libXrender.out}/lib/" + "${xorg.libXext.out}/lib/" + "${xorg.libX11.out}/lib/" + "${xorg.libXinerama.out}/lib/" + "${xorg.libSM.out}/lib/" + "${xorg.libICE.out}/lib/" + "${stdenv.cc.cc.out}/lib/" ]; # without this some applications like blender don't start, but they start diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 2b73dc798c3fb..9750a2a76499e 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ pythonDBus pygobject pygobject3 recursivePthLoader ]; buildInputs = - [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython + [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython readline libsndfile udev libical # Disables GStreamer; not clear what it gains us other than a # zillion extra dependencies. diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix index 80adc0fd56b8c..68db9345bd0e8 100644 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ pythonDBus pygobject pygobject3 recursivePthLoader ]; buildInputs = - [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython + [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython readline libsndfile udev libical # Disables GStreamer; not clear what it gains us other than a # zillion extra dependencies. diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 23e5171d17801..4f30bc19caf84 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper + [ pkgconfig dbus glib libusb alsaLib python makeWrapper readline libsndfile # Disables GStreamer; not clear what it gains us other than a # zillion extra dependencies. diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index 1c79fddeca962..2260ac08b632c 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnih, dbus, pam }: stdenv.mkDerivation rec { - name = "cgmanager-0.39"; + name = "cgmanager-0.41"; src = fetchurl { url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz"; - sha256 = "0ysv8klnybp727aad2k0aa67s05q027pzfl7rmm0map4nizlhrcy"; + sha256 = "0n5l4g78ifvyfnj8x9xz06mqn4y8j73sgg4xsbak7hiszfz5bc99"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 5752bbb72bc49..1a879ba33304d 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { cp checksec.sh $out/bin/checksec chmod +x $out/bin/checksec substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell} - substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6 + substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6 substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" - substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/bin/readelf" + substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index 3c209c6253ddc..32905b8ec39f8 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="conspy"; - version="1.13"; + version="1.14"; name="${baseName}-${version}"; - hash="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2"; - url="mirror://sourceforge/project/conspy/conspy-1.13-1/conspy-1.13.tar.gz"; - sha256="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2"; + hash="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; + url="mirror://sourceforge/project/conspy/conspy-1.14-1/conspy-1.14.tar.gz"; + sha256="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; }; buildInputs = [ autoconf automake ncurses diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 919799abb6991..16116019567d8 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,24 +1,27 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper }: +, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig +, python }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "1.3-rc2"; + version = "2.0"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "1h9ii91aq8cja22j3520vg3qb3y9h6c064s4115s2ldylm8jmi0s"; + sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8"; }; enableParallelBuilding = true; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap pkgconfig python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./Makefile --replace "-Werror" "" + substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl}/include/libnl3" + substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" + ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; configurePhase = "make config PREFIX=$out"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index d90d6faac3967..60615fb1e5be6 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, udev, perl }: +{ stdenv, fetchurl, flex, systemd, perl }: assert stdenv.isLinux; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export PATH=${udev}/sbin:$PATH + export PATH=${systemd.udev.bin}/sbin:$PATH substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ substituteInPlace user/legacy/Makefile.in \ --replace /sbin/ $out/sbin/ \ diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index 61e100f4c9b72..f60951f5541eb 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -1,41 +1,39 @@ -{ stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }: +{ stdenv, lib, fetchurl, gnugrep, glibc, gawk, coreutils, bridge-utils, iproute +, dnsmasq, iptables, kmod, utillinux, gnused }: -let stateDir = "/var/lib/fan-networking"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "fanctl-${version}"; - version = "0.3.0"; + version = "0.9.0"; - src = fetchbzr { - url = "https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/ubuntu-fan/vivid-updates"; - rev = 2; - sha256 = "1vcr2rg99g7sx1zynhiggjzc9y9z591i4535hbm21dysy3cisp7i"; + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz"; + sha256 = "03dv5zzb8fkl9kkbhznxm48d6j3fjms74fn0s1zip2gz53l1s14n"; }; - buildInputs = [ makeWrapper ]; + # The Ubuntu package creates a number of state/config directories upon + # installation, and so the fanctl script expects those directories to exist + # before being used. Instead, we patch the fanctl script to gracefully handle + # the fact that the directories might not exist yet. + # Also, when dnsmasq is given --conf-file="", it will still attempt to read + # /etc/dnsmasq.conf; if that file does not exist, dnsmasq subsequently fails, + # so we'll use /dev/null, which actually works as intended. + patches = [ ./robustness.patch ]; - # When given --conf-file="", dnsmasq still attempts to read /etc/dnsmasq.conf; - # if that files does not exist, dnsmasq subsequently fails, - # so we'll use /dev/null. - # - # Also, make sure the state directory before starting dnsmasq. - buildPhase = '' + postPatch = '' substituteInPlace fanctl \ - --replace '--conf-file= ' \ - '--conf-file=/dev/null ' \ - --replace '/var/lib/misc' \ - '${stateDir}' - - sed -i '/dnsmasq -u/i \ - mkdir -p ${stateDir}' fanctl + --replace '@PATH@' \ + '${lib.makeBinPath [ + gnugrep gawk coreutils bridge-utils iproute dnsmasq + iptables kmod utillinux gnused + glibc # needed for getent + ]}' ''; installPhase = '' mkdir -p $out/bin $out/man/man8 cp fanctl.8 $out/man/man8 cp fanctl $out/bin - wrapProgram $out/bin/fanctl --prefix PATH : \ - ${lib.makeSearchPath "bin" [ bridge-utils iproute dnsmasq iptables kmod utillinux ]}; ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/fanctl/robustness.patch b/pkgs/os-specific/linux/fanctl/robustness.patch new file mode 100644 index 0000000000000..7a70a784e3ee8 --- /dev/null +++ b/pkgs/os-specific/linux/fanctl/robustness.patch @@ -0,0 +1,85 @@ +diff --git a/fanctl b/fanctl +index 4338b75..84cf987 100755 +--- a/fanctl ++++ b/fanctl +@@ -5,6 +5,8 @@ + # fanctl down 15 10.1.0.1 + # + ++export PATH="@PATH@" ++ + usage() + { + echo "Usage: $0 <cmd> [<options>...]" 1>&2 +@@ -23,8 +25,8 @@ run() + "$@" + } + +-state_dir="/run/ubuntu-fan" +-lconfig_dir="/var/lib/ubuntu-fan/config" ++state_dir="/run/fan-networking" ++lconfig_dir="/var/lib/fan-networking/config" + + __ip_split() + { +@@ -931,12 +933,12 @@ dhcp_reconfigure() + --strict-order \ + --bind-interfaces \ + --pid-file="$state_dir/dnsmasq-$C_bridge_state.pid" \ +- --conf-file= \ ++ --conf-file=/dev/null \ + $dhcp_flags \ + --dhcp-no-override \ + --except-interface=lo \ + --interface="$C_bridge" \ +- --dhcp-leasefile=/var/lib/misc/dnsmasq."$C_bridge_state".leases \ ++ --dhcp-leasefile=/var/lib/fan-networking/dnsmasq."$C_bridge_state".leases \ + --dhcp-authoritative \ + || $fail "$C_bridge: failed to start dnsmasq" + +@@ -1559,21 +1561,23 @@ cmd_config() + + case "$cmd" in + list|ls) +- ls -1 "$lconfig_dir" | \ +- while read config +- do +- case "$config" in +- *.conf) ;; +- *) continue ;; +- esac ++ if [ -d $lconfig_dir ]; then ++ ls -1 "$lconfig_dir" | \ ++ while read config ++ do ++ case "$config" in ++ *.conf) ;; ++ *) continue ;; ++ esac + +- config=$( echo "$config" | sed \ +- -e 's/.conf$//' \ +- -e 's/--/ /g' \ +- -e 's@-@/@g' +- ) +- echo "$config" +- done ++ config=$( echo "$config" | sed \ ++ -e 's/.conf$//' \ ++ -e 's/--/ /g' \ ++ -e 's@-@/@g' ++ ) ++ echo "$config" ++ done ++ fi + ;; + show) + cmd_decode_init +@@ -1588,6 +1592,7 @@ cmd_config() + [ -f "$uconfig" ] && cat "$uconfig" + ;; + set) ++ mkdir -p $lconfig_dir || fail "could not create config directory ($lconfig_dir)" + cmd_decode_init + if ! cmd_decode_config "config set" "$@"; then + fail "invalid config" diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 57820f92cc4f1..dac0eb0d0f509 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.38"; + version="0.9.40"; name="${baseName}-${version}"; - hash="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.38-rc1.tar.bz2"; - sha256="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i"; + hash="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.40-rc1.tar.bz2"; + sha256="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index dc0b061af14c5..0c61aee9713ef 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,14 +2,14 @@ let - rev = "b7bbd3d1683e9f3bb11ef86b952adee71e83862f"; + rev = "1.20160315"; in stdenv.mkDerivation { name = "raspberrypi-firmware-${rev}"; src = fetchurl { url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz"; - sha256 = "16wpwa1y3imd3la477b3rfbfypssvlh0zjdag3hgkm33aysizijp"; + sha256 = "0a7ycv01s0kk84szsh51hy2mjjil1dzdk0g7k83h50d5nya090fl"; }; installPhase = '' @@ -24,9 +24,11 @@ in stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "Firmware for the Raspberry Pi board"; homepage = https://github.com/raspberrypi; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + platforms = [ "armv6l-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ viric tavyc ]; }; } diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix index e2f8d423a61d6..e77d596dc6f8b 100644 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out for BIN in $(find $out/bin -type f); do echo Patching $BIN - patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN + patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc.out}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN # Test our binary to see if it was correctly patched set +e diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 1500cf2f39491..121b6db540022 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "FLEX=${flex}/bin/flex" "BISON=${bison}/bin/bison" "FIND=${findutils}/bin/find" - "STRIP=${binutils}/bin/strip" + "STRIP=${binutils.out}/bin/strip" "INSTALL=${coreutils}/bin/install" "MANDIR=/share/man" "MKNOD=true" diff --git a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch new file mode 100644 index 0000000000000..ca91b81600083 --- /dev/null +++ b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch @@ -0,0 +1,65 @@ +Description: POC fan driver support + POC Fan driver support +Author: Jay Vosburgh <jay.vosburgh@canonical.com> + +Index: iproute2-4.1.1/include/linux/if_tunnel.h +=================================================================== +--- iproute2-4.1.1.orig/include/linux/if_tunnel.h ++++ iproute2-4.1.1/include/linux/if_tunnel.h +@@ -57,6 +57,9 @@ enum { + IFLA_IPTUN_ENCAP_FLAGS, + IFLA_IPTUN_ENCAP_SPORT, + IFLA_IPTUN_ENCAP_DPORT, ++ ++ IFLA_IPTUN_FAN_UNDERLAY = 32, ++ + __IFLA_IPTUN_MAX, + }; + #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) +Index: iproute2-4.1.1/ip/link_iptnl.c +=================================================================== +--- iproute2-4.1.1.orig/ip/link_iptnl.c ++++ iproute2-4.1.1/ip/link_iptnl.c +@@ -66,6 +66,7 @@ static int iptunnel_parse_opt(struct lin + __u32 link = 0; + __u32 laddr = 0; + __u32 raddr = 0; ++ __u32 underlay = 0; + __u8 ttl = 0; + __u8 tos = 0; + __u8 pmtudisc = 1; +@@ -174,6 +175,9 @@ get_failed: + raddr = get_addr32(*argv); + else + raddr = 0; ++ } else if (strcmp(*argv, "underlay") == 0) { ++ NEXT_ARG(); ++ underlay = get_addr32(*argv); + } else if (strcmp(*argv, "local") == 0) { + NEXT_ARG(); + if (strcmp(*argv, "any")) +@@ -318,6 +322,9 @@ get_failed: + } + } + ++ if (underlay) ++ addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay); ++ + return 0; + } + +@@ -349,6 +356,14 @@ static void iptunnel_print_opt(struct li + + fprintf(f, "local %s ", local); + ++ if (tb[IFLA_IPTUN_FAN_UNDERLAY]) { ++ unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]); ++ ++ if (addr) ++ fprintf(f, "underlay %s ", ++ format_host(AF_INET, 4, &addr, s1, sizeof(s1))); ++ } ++ + if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) { + unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]); + const char *n = if_indextoname(link, s2); diff --git a/pkgs/os-specific/linux/iproute/ubuntu-fan.patch b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch index e55425c2ce6a0..a940b341ea0f7 100644 --- a/pkgs/os-specific/linux/iproute/ubuntu-fan.patch +++ b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch @@ -1,27 +1,19 @@ -This provides support for Ubuntu's Fan Networking [1]. - -These patches were pulled from: -https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/iproute2/vivid-proposed - -See revisions 18 and 19. - -[1] https://wiki.ubuntu.com/FanNetworking - -diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h -index 102ce7a..7b8f0e5 100644 ---- a/include/linux/if_tunnel.h -+++ b/include/linux/if_tunnel.h -@@ -57,6 +57,9 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, +Description: Fan driver support v3 + Fan driver support v3 +Author: Jay Vosburgh <jay.vosburgh@canonical.com> +Index: iproute2-4.1.1/include/linux/if_tunnel.h +=================================================================== +--- iproute2-4.1.1.orig/include/linux/if_tunnel.h ++++ iproute2-4.1.1/include/linux/if_tunnel.h +@@ -59,6 +59,7 @@ enum { IFLA_IPTUN_ENCAP_DPORT, -+ -+ IFLA_IPTUN_FAN_UNDERLAY = 32, + + IFLA_IPTUN_FAN_UNDERLAY = 32, + IFLA_IPTUN_FAN_MAP = 33, + __IFLA_IPTUN_MAX, }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -@@ -131,4 +134,20 @@ enum { +@@ -134,4 +135,20 @@ enum { }; #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) @@ -42,10 +34,10 @@ index 102ce7a..7b8f0e5 100644 +}; + #endif /* _IF_TUNNEL_H_ */ -diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c -index 9d6bc98..ec3f05d 100644 ---- a/ip/link_iptnl.c -+++ b/ip/link_iptnl.c +Index: iproute2-4.1.1/ip/link_iptnl.c +=================================================================== +--- iproute2-4.1.1.orig/ip/link_iptnl.c ++++ iproute2-4.1.1/ip/link_iptnl.c @@ -49,6 +49,42 @@ static void usage(int sit) print_usage(stderr, sit); exit(-1); @@ -89,21 +81,10 @@ index 9d6bc98..ec3f05d 100644 static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) -@@ -66,6 +102,7 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv, - __u32 link = 0; - __u32 laddr = 0; - __u32 raddr = 0; -+ __u32 underlay = 0; - __u8 ttl = 0; - __u8 tos = 0; - __u8 pmtudisc = 1; -@@ -174,6 +211,13 @@ get_failed: - raddr = get_addr32(*argv); - else - raddr = 0; -+ } else if (strcmp(*argv, "underlay") == 0) { -+ NEXT_ARG(); -+ underlay = get_addr32(*argv); +@@ -178,6 +214,10 @@ get_failed: + } else if (strcmp(*argv, "underlay") == 0) { + NEXT_ARG(); + underlay = get_addr32(*argv); + } else if (strcmp(*argv, "fan-map") == 0) { + NEXT_ARG(); + if (fan_parse_map(&argc, &argv, n)) @@ -111,13 +92,7 @@ index 9d6bc98..ec3f05d 100644 } else if (strcmp(*argv, "local") == 0) { NEXT_ARG(); if (strcmp(*argv, "any")) -@@ -318,9 +362,32 @@ get_failed: - } - } - -+ if (underlay) -+ addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay); -+ +@@ -328,6 +368,28 @@ get_failed: return 0; } @@ -127,16 +102,18 @@ index 9d6bc98..ec3f05d 100644 + struct ip_tunnel_fan_map *m; + struct rtattr *i; + int rem; ++ int p; + + fprintf(f, "fan-map "); + + rem = RTA_PAYLOAD(attr); + for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { ++ p = RTA_PAYLOAD(i); + m = RTA_DATA(i); + fprintf(f, "%s/%d:%s/%d ", -+ rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->overlay, b1, INET_ADDRSTRLEN), ++ rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), + m->overlay_prefix, -+ rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->underlay, b2, INET_ADDRSTRLEN), ++ rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), + m->underlay_prefix); + } +} @@ -144,18 +121,10 @@ index 9d6bc98..ec3f05d 100644 static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) { char s1[1024]; -@@ -349,6 +416,17 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[ - - fprintf(f, "local %s ", local); +@@ -364,6 +426,9 @@ static void iptunnel_print_opt(struct li + format_host(AF_INET, 4, &addr, s1, sizeof(s1))); + } -+ if (tb[IFLA_IPTUN_FAN_UNDERLAY]) { -+ unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]); -+ -+ if (addr) -+ fprintf(f, "underlay %s ", -+ format_host(AF_INET, 4, &addr, s1, sizeof(s1))); -+ } -+ + if (tb[IFLA_IPTUN_FAN_MAP]) + fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]); + diff --git a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch new file mode 100644 index 0000000000000..2ddc2840bdd13 --- /dev/null +++ b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch @@ -0,0 +1,177 @@ +Description: Fan driver support VXLAN (p4) + Fan driver setup support for vxlan interfaces. + +Index: iproute2-4.3.0/include/linux/if_link.h +=================================================================== +--- iproute2-4.3.0.orig/include/linux/if_link.h ++++ iproute2-4.3.0/include/linux/if_link.h +@@ -392,6 +392,7 @@ enum { + IFLA_VXLAN_GBP, + IFLA_VXLAN_REMCSUM_NOPARTIAL, + IFLA_VXLAN_COLLECT_METADATA, ++ IFLA_VXLAN_FAN_MAP = 33, + __IFLA_VXLAN_MAX + }; + #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) +Index: iproute2-4.3.0/include/linux/if_tunnel.h +=================================================================== +--- iproute2-4.3.0.orig/include/linux/if_tunnel.h ++++ iproute2-4.3.0/include/linux/if_tunnel.h +@@ -145,7 +145,7 @@ enum { + + #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) + +-struct ip_tunnel_fan_map { ++struct ifla_fan_map { + __be32 underlay; + __be32 overlay; + __u16 underlay_prefix; +Index: iproute2-4.3.0/ip/iplink_vxlan.c +=================================================================== +--- iproute2-4.3.0.orig/ip/iplink_vxlan.c ++++ iproute2-4.3.0/ip/iplink_vxlan.c +@@ -15,7 +15,10 @@ + #include <net/if.h> + #include <linux/ip.h> + #include <linux/if_link.h> ++#include <linux/types.h> + #include <arpa/inet.h> ++#include <linux/in6.h> ++#include <linux/if_tunnel.h> + + #include "rt_names.h" + #include "utils.h" +@@ -43,6 +46,45 @@ static void explain(void) + print_explain(stderr); + } + ++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n) ++{ ++ inet_prefix underlay, overlay; ++ struct ifla_fan_map map; ++ struct rtattr *nest; ++ char **argv = *argvp; ++ int argc = *argcp; ++ ++ nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP); ++ while (argc > 0) { ++ char *colon = strchr(*argv, ':'); ++ ++ if (!colon) { ++ PREV_ARG(); ++ break; ++ } ++ *colon = '\0'; ++ ++ if (get_prefix(&overlay, *argv, AF_INET)) ++ invarg("invalid fan-map overlay", *argv); ++ if (get_prefix(&underlay, colon + 1, AF_INET)) ++ invarg("invalid fan-map underlay", colon + 1); ++ ++ memcpy(&map.underlay, underlay.data, 4); ++ map.underlay_prefix = underlay.bitlen; ++ memcpy(&map.overlay, overlay.data, 4); ++ map.overlay_prefix = overlay.bitlen; ++ ++ argc--, argv++; ++ ++ addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map)); ++ } ++ addattr_nest_end(n, nest); ++ ++ *argcp = argc; ++ *argvp = argv; ++ return 0; ++} ++ + static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, + struct nlmsghdr *n) + { +@@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u + udp6zerocsumrx = 0; + } else if (!matches(*argv, "gbp")) { + gbp = 1; ++ } else if (!matches(*argv, "fan-map")) { ++ NEXT_ARG(); ++ if (fan_parse_map(&argc, &argv, n)) ++ invarg("invalid fan-map", *argv); + } else if (matches(*argv, "help") == 0) { + explain(); + return -1; +@@ -279,6 +325,28 @@ static int vxlan_parse_opt(struct link_u + return 0; + } + ++static void fan_print_map(FILE *f, struct rtattr *attr) ++{ ++ char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN]; ++ struct ifla_fan_map *m; ++ struct rtattr *i; ++ int rem; ++ int p; ++ ++ fprintf(f, "fan-map "); ++ ++ rem = RTA_PAYLOAD(attr); ++ for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { ++ p = RTA_PAYLOAD(i); ++ m = RTA_DATA(i); ++ fprintf(f, "%s/%d:%s/%d ", ++ rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), ++ m->overlay_prefix, ++ rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), ++ m->underlay_prefix); ++ } ++} ++ + static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) + { + __u32 vni; +@@ -321,6 +389,9 @@ static void vxlan_print_opt(struct link_ + } + } + ++ if (tb[IFLA_VXLAN_FAN_MAP]) ++ fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]); ++ + if (tb[IFLA_VXLAN_LOCAL]) { + __be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]); + if (addr) +Index: iproute2-4.3.0/ip/link_iptnl.c +=================================================================== +--- iproute2-4.3.0.orig/ip/link_iptnl.c ++++ iproute2-4.3.0/ip/link_iptnl.c +@@ -49,10 +49,11 @@ static void usage(int sit) + print_usage(stderr, sit); + exit(-1); + } ++ + static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n) + { + inet_prefix underlay, overlay; +- struct ip_tunnel_fan_map map; ++ struct ifla_fan_map map; + struct rtattr *nest; + char **argv = *argvp; + int argc = *argcp; +@@ -61,8 +62,10 @@ static int fan_parse_map(int *argcp, cha + while (argc > 0) { + char *colon = strchr(*argv, ':'); + +- if (!colon) ++ if (!colon) { ++ PREV_ARG(); + break; ++ } + *colon = '\0'; + + if (get_prefix(&overlay, *argv, AF_INET)) +@@ -371,7 +374,7 @@ get_failed: + static void fan_print_map(FILE *f, struct rtattr *attr) + { + char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN]; +- struct ip_tunnel_fan_map *m; ++ struct ifla_fan_map *m; + struct rtattr *i; + int rem; + int p; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 891d39d24dd8b..5f328bd90c84d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -10,7 +10,13 @@ stdenv.mkDerivation rec { sha256 = "159988vv3fd78bzhisfl1dl4dd7km3vjzs2d8899a0vcvn412fzh"; }; - patches = lib.optionals enableFan [ ./ubuntu-fan.patch ]; + patches = lib.optionals enableFan [ + # These patches were pulled from: + # https://launchpad.net/ubuntu/xenial/+source/iproute2 + ./1000-ubuntu-poc-fan-driver.patch + ./1001-ubuntu-poc-fan-driver-v3.patch + ./1002-ubuntu-poc-fan-driver-vxlan.patch + ]; preConfigure = '' patchShebangs ./configure diff --git a/pkgs/os-specific/linux/iptables/1.6.nix b/pkgs/os-specific/linux/iptables/1.6.nix new file mode 100644 index 0000000000000..88821a15d73ef --- /dev/null +++ b/pkgs/os-specific/linux/iptables/1.6.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}: + +stdenv.mkDerivation rec { + name = "iptables-${version}"; + version = "1.6.0"; + + src = fetchurl { + url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; + sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb"; + }; + + nativeBuildInputs = [bison flex]; + + buildInputs = [libnetfilter_conntrack libnftnl libmnl]; + + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" + ''; + + configureFlags = '' + --enable-devel + --enable-shared + ''; + + meta = { + description = "A program to configure the Linux IP packet filtering ruleset"; + homepage = http://www.netfilter.org/projects/iptables/index.html; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.netfilter.org/projects/iptables/files/"; + updateWalker = true; + inherit version; + }; +} diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index bb2915958f7ca..fddaa84a82404 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Fix the path to gzip/bzip2. substituteInPlace src/libkeymap/findfile.c \ --replace gzip ${gzip}/bin/gzip \ - --replace bzip2 ${bzip2}/bin/bzip2 \ + --replace bzip2 ${bzip2.bin}/bin/bzip2 \ # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fecb3b05f97e1..c6dfb69352350 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.6"; + version = "4.4.7"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zapxjnawdn0km6b9pc7399zbjiyb0a28rqmsif3afc9qb2cxg53"; + sha256 = "00nkh0klk9b777fvhgf10wsrc7h8ycchgazwirk2926wmisjhl8q"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix index 790175d6e8876..14ae13c320d18 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5"; - modDirVersion = "4.5.0"; + version = "4.5.1"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "172i3arrc34mb7nxw31iqrmbwrdnp8dmrbf8p3b3f6z006sfy3d4"; + sha256 = "0q6qkp7w5hy1ai13zgvj2982kjk81rfzd8ff7ixp3slq8bmsz07i"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e3edaa43b8cd2..ea9eb4d551b0e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6-rc2"; - modDirVersion = "4.6.0-rc2"; + version = "4.6-rc3"; + modDirVersion = "4.6.0-rc3"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0zihk9s1rkgmn0ghiz9xkg0w88w524af5mmad45rbxhm5751nxcr"; + sha256 = "1vhvhbldk5pvwxhdndyzvyqy5mscpnlz09sfyh2c9rk6wc1hc8xv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1e0c3eeea046c..1fb702d574632 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -74,7 +74,7 @@ let installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); - in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { + in (optionalAttrs isModular { outputs = [ "out" "dev" ]; propagatedBuildOutputs = ""; }) // { passthru = { inherit version modDirVersion config kernelPatches configfile; }; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a8fb1598af7e9..707ebb544bf47 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -71,14 +71,9 @@ rec { patch = ./mips-ext3-n32.patch; }; - ubuntu_fan = + ubuntu_fan_4_4 = { name = "ubuntu-fan"; - patch = ./ubuntu-fan-3.patch; - }; - - ubuntu_fan_4 = - { name = "ubuntu-fan"; - patch = ./ubuntu-fan-4.patch; + patch = ./ubuntu-fan-4.4.patch; }; ubuntu_unprivileged_overlayfs = @@ -159,4 +154,8 @@ rec { { name = "mfd_fix_dependency"; patch = ./chromiumos-patches/mfd-fix-dependency.patch; }; + qat_common_Makefile = + { name = "qat_common_Makefile"; + patch = ./qat_common_Makefile.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch new file mode 100644 index 0000000000000..2d4476a7fe50c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch @@ -0,0 +1,10 @@ +--- a/drivers/crypto/qat/qat_common/Makefile ++++ b/drivers/crypto/qat/qat_common/Makefile +@@ -2,6 +2,7 @@ + $(obj)/qat_rsapubkey-asn1.h + $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \ + $(obj)/qat_rsaprivkey-asn1.h ++$(obj)/qat_asym_algs.o: $(obj)/qat_rsaprivkey-asn1.h $(obj)/qat_rsapubkey-asn1.h + + clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h + clean-files += qat_rsaprivkey-asn1.c qat_rsapvivkey-asn1.h diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch deleted file mode 100644 index c80950d061471..0000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch +++ /dev/null @@ -1,616 +0,0 @@ -From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh <jay.vosburgh@canonical.com> -Date: Wed, 1 Apr 2015 16:11:09 -0700 -Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2) - -Modification to ipip tunnel driver to accept a new netlink option, -IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables -TX side destination address remapping for traffic entering the tunnel -(to be encapsulated). - -For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B, -where "F" and "G" are the first two octets of the underlay network (the -network portion of a /16), "A" and "B" are the low order two octets of the -underlay network host (the host portion of a /16), and "Y" is a configured -first octet of the overlay network. - -E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to 99.6.7.8 -would be directed to underlay host 10.88.6.7, which hosts overlay network -99.6.7.0/24. - -Includes net.fan.version sysctl as a sentinel for availability of the -fan functionality. - -NOTE: this requires an updated iproute2 to facilitate configuration of -the fan. - -BugLink: http://bugs.launchpad.net/bugs/1439706 -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -[apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing - with future feature additions.] -Signed-off-by: Andy Whitcroft <apw@canonical.com> ---- - include/net/ip_tunnels.h | 6 +++ - include/uapi/linux/if_tunnel.h | 4 ++ - net/ipv4/ipip.c | 112 +++++++++++++++++++++++++++++++++++++++-- - 3 files changed, 117 insertions(+), 5 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 25a59eb..d7eada2 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -51,6 +51,11 @@ struct ip_tunnel_dst { - __be32 saddr; - }; - -+/* Underlay address prefix for ipip fan mode */ -+struct ip_tunnel_fan { -+ u32 underlay; -+}; -+ - struct ip_tunnel { - struct ip_tunnel __rcu *next; - struct hlist_node hash_node; -@@ -82,6 +87,7 @@ struct ip_tunnel { - #endif - struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ - unsigned int prl_count; /* # of entries in PRL */ -+ struct ip_tunnel_fan fan; - int ip_tnl_net_id; - struct gro_cells gro_cells; - }; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index bd3cc11..8f7d269 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -57,6 +57,10 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, -+ -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_UNDERLAY=32, -+ - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 40403114..e3c27cd 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -209,13 +209,38 @@ drop: - } - - /* -+ * Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. For an overlay (inner) address Y.A.B.C, the transformation is -+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay -+ * network (the network portion of a /16), "A" and "B" are the low order -+ * two octets of the underlay network host (the host portion of a /16), -+ * and "Y" is a configured first octet of the overlay network. -+ * -+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -+ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -+ * overlay network 99.6.7.0/24. -+ */ -+static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+{ -+ u32 daddr; -+ -+ *iph = tunnel->parms.iph; -+ -+ daddr = ntohl(ip_hdr(skb)->daddr); -+ iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) | -+ ((daddr >> 8) & 0x0000ffff)); -+} -+ -+/* - * This function assumes it is being called from dev_queue_xmit() - * and that skb is filled properly by that function. - */ - static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct ip_tunnel *tunnel = netdev_priv(dev); -- const struct iphdr *tiph = &tunnel->parms.iph; -+ const struct iphdr *tiph; -+ struct iphdr fiph; - - if (unlikely(skb->protocol != htons(ETH_P_IP))) - goto tx_error; -@@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -+ if (tunnel->fan.underlay) { -+ ipip_build_fan_iphdr(tunnel, skb, &fiph); -+ tiph = &fiph; -+ } else { -+ tiph = &tunnel->parms.iph; -+ } -+ - skb_set_inner_ipproto(skb, IPPROTO_IPIP); - - ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); -@@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, -+ struct ip_tunnel_parm *parms) -+{ -+ u32 net = t->fan.underlay; -+ -+ if (!data[IFLA_IPTUN_FAN_UNDERLAY]) -+ goto err_check; -+ -+ net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000; -+ -+err_check: -+ if (parms->iph.daddr && net) -+ return -EINVAL; -+ -+ t->fan.underlay = net; -+ -+ return 0; -+} -+ - static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - return ip_tunnel_newlink(dev, tb, &p); - } - -@@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - - if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || - (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) -@@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -+ /* IFLA_IPTUN_FAN_UNDERLAY */ -+ nla_total_size(4) + - 0; - } - -@@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -+ if (tunnel->fan.underlay) -+ if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY, -+ htonl(tunnel->fan.underlay))) -+ goto nla_put_failure; -+ - return 0; - - nla_put_failure: -@@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, -+ -+ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -+ [IFLA_IPTUN_FAN_UNDERLAY] = { .type = NLA_U32 }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = { - .size = sizeof(struct ip_tunnel_net), - }; - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *ipip_fan_header; -+static unsigned int ipip_fan_version = 1; -+ -+static struct ctl_table ipip_fan_sysctls[] = { -+ { -+ .procname = "version", -+ .data = &ipip_fan_version, -+ .maxlen = sizeof(ipip_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+ -+#endif /* CONFIG_SYSCTL */ -+ - static int __init ipip_init(void) - { - int err; -@@ -542,9 +628,22 @@ static int __init ipip_init(void) - if (err < 0) - goto rtnl_link_failed; - -+#ifdef CONFIG_SYSCTL -+ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", -+ ipip_fan_sysctls); -+ if (!ipip_fan_header) { -+ err = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - out: - return err; - -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&ipip_link_ops); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_failed: - xfrm4_tunnel_deregister(&ipip_handler, AF_INET); - xfrm_tunnel_failed: -@@ -554,6 +653,9 @@ xfrm_tunnel_failed: - - static void __exit ipip_fini(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(ipip_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&ipip_link_ops); - if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) - pr_info("%s: can't deregister tunnel\n", __func__); --- -2.4.1 - -From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft <apw@canonical.com> -Date: Tue, 21 Jul 2015 16:52:10 +0100 -Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) - -Switch to a single tunnel for all mappings, this removes the limitations -on how many mappings each tunnel can handle, and therefore how many Fan -slices each local address may hold. - -NOTE: This introduces a new kernel netlink interface which needs updated -iproute2 support. - -BugLink: http://bugs.launchpad.net/bugs/1470091 -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -Signed-off-by: Andy Whitcroft <apw@canonical.com> -Acked-by: Tim Gardner <tim.gardner@canonical.com> -Acked-by: Brad Figg <brad.figg@canonical.com> -Signed-off-by: Brad Figg <brad.figg@canonical.com> ---- - include/net/ip_tunnels.h | 14 ++++- - include/uapi/linux/if_tunnel.h | 20 ++++++- - net/ipv4/ip_tunnel.c | 7 ++- - net/ipv4/ipip.c | 120 +++++++++++++++++++++++++++++++++-------- - 4 files changed, 133 insertions(+), 28 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index d7eada2..2f7bc8c 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -51,9 +51,18 @@ struct ip_tunnel_dst { - __be32 saddr; - }; - --/* Underlay address prefix for ipip fan mode */ -+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 -+ * underlay (10.88.0.0/16, for example). Multiple local addresses within -+ * the /16 may be used, but a particular overlay may not span -+ * multiple underlay subnets. -+ * -+ * We store one underlay, indexed by the overlay's high order octet. -+ */ -+#define FAN_OVERLAY_CNT 256 -+ - struct ip_tunnel_fan { -- u32 underlay; -+/* u32 __rcu *map;*/ -+ u32 map[FAN_OVERLAY_CNT]; - }; - - struct ip_tunnel { -@@ -104,6 +113,7 @@ struct ip_tunnel { - #define TUNNEL_OAM __cpu_to_be16(0x0200) - #define TUNNEL_CRIT_OPT __cpu_to_be16(0x0400) - #define TUNNEL_OPTIONS_PRESENT __cpu_to_be16(0x0800) -+#define TUNNEL_FAN __cpu_to_be16(0x4000) - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 8f7d269..9625934 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -58,8 +58,8 @@ enum { - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, - -- __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -- IFLA_IPTUN_FAN_UNDERLAY=32, -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_MAP = 33, - - __IFLA_IPTUN_MAX, - }; -@@ -135,4 +135,20 @@ enum { - }; - - #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+ -+enum { -+ IFLA_FAN_UNSPEC, -+ IFLA_FAN_MAPPING, -+ __IFLA_FAN_MAX, -+}; -+ -+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) -+ -+struct ip_tunnel_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ __u16 underlay_prefix; -+ __u16 overlay_prefix; -+}; -+ - #endif /* _UAPI_IF_TUNNEL_H_ */ -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index d3e4479..60bd10f 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1078,6 +1078,11 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - -+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return -EINVAL; -+ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index e3c27cd..d6ebc66 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -107,6 +107,7 @@ - #include <linux/init.h> - #include <linux/netfilter_ipv4.h> - #include <linux/if_ether.h> -+#include <linux/inetdevice.h> - - #include <net/sock.h> - #include <net/ip.h> -@@ -208,6 +209,11 @@ drop: - return 0; - } - -+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - /* - * Determine fan tunnel endpoint to send packet to, based on the inner IP - * address. For an overlay (inner) address Y.A.B.C, the transformation is -@@ -221,15 +227,20 @@ drop: - * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts - * overlay network 99.6.7.0/24. - */ --static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) - { -- u32 daddr; -- -- *iph = tunnel->parms.iph; -+ unsigned int overlay; -+ u32 daddr, underlay; - - daddr = ntohl(ip_hdr(skb)->daddr); -- iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) | -- ((daddr >> 8) & 0x0000ffff)); -+ overlay = daddr >> 24; -+ underlay = tunnel->fan.map[overlay]; -+ if (!underlay) -+ return -EINVAL; -+ -+ *iph = tunnel->parms.iph; -+ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ return 0; - } - - /* -@@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -- if (tunnel->fan.underlay) { -- ipip_build_fan_iphdr(tunnel, skb, &fiph); -+ if (ipip_tunnel_is_fan(tunnel)) { -+ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) -+ goto tx_error; - tiph = &fiph; - } else { - tiph = &tunnel->parms.iph; -@@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static void ipip_fan_free_map(struct ip_tunnel *t) -+{ -+ memset(&t->fan.map, 0, sizeof(t->fan.map)); -+} -+ -+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+{ -+ u32 overlay, overlay_mask, underlay, underlay_mask; -+ -+ if ((map->underlay_prefix && map->underlay_prefix != 16) || -+ (map->overlay_prefix && map->overlay_prefix != 8)) -+ return -EINVAL; -+ -+ overlay = ntohl(map->overlay); -+ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ -+ underlay = ntohl(map->underlay); -+ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+ -+ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ return -EINVAL; -+ -+ t->parms.i_flags |= TUNNEL_FAN; -+ -+ /* Special case: overlay 0 and underlay 0 clears all mappings */ -+ if (!overlay && !underlay) { -+ ipip_fan_free_map(t); -+ return 0; -+ } -+ -+ overlay >>= (32 - map->overlay_prefix); -+ t->fan.map[overlay] = underlay; -+ -+ return 0; -+} -+ -+ - static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - struct ip_tunnel_parm *parms) - { -- u32 net = t->fan.underlay; -- -- if (!data[IFLA_IPTUN_FAN_UNDERLAY]) -- goto err_check; -+ struct ip_tunnel_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; - -- net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000; -+ if (!data[IFLA_IPTUN_FAN_MAP]) -+ return 0; - --err_check: -- if (parms->iph.daddr && net) -+ if (parms->iph.daddr) - return -EINVAL; - -- t->fan.underlay = net; -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = ipip_fan_set_map(t, map); -+ if (rv) -+ return rv; -+ } - - return 0; - } -@@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -- /* IFLA_IPTUN_FAN_UNDERLAY */ -- nla_total_size(4) + -+ /* IFLA_IPTUN_FAN_MAP */ -+ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + - 0; - } - -@@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -- if (tunnel->fan.underlay) -- if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY, -- htonl(tunnel->fan.underlay))) -+ if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ struct nlattr *fan_nest; -+ int i; -+ -+ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); -+ if (!fan_nest) - goto nla_put_failure; -+ for (i = 0; i < 256; i++) { -+ if (tunnel->fan.map[i]) { -+ struct ip_tunnel_fan_map map; -+ -+ map.underlay = htonl(tunnel->fan.map[i]); -+ map.underlay_prefix = 16; -+ map.overlay = htonl(i << 24); -+ map.overlay_prefix = 8; -+ if (nla_put(skb, IFLA_FAN_MAPPING, -+ sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ } -+ nla_nest_end(skb, fan_nest); -+ } - - return 0; - -@@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, - - [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -- [IFLA_IPTUN_FAN_UNDERLAY] = { .type = NLA_U32 }, -+ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = { - - #ifdef CONFIG_SYSCTL - static struct ctl_table_header *ipip_fan_header; --static unsigned int ipip_fan_version = 1; -+static unsigned int ipip_fan_version = 3; - - static struct ctl_table ipip_fan_sysctls[] = { - { --- -2.4.1 - diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch new file mode 100644 index 0000000000000..39150ad790d30 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch @@ -0,0 +1,1240 @@ +From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001 +From: Jay Vosburgh <jay.vosburgh@canonical.com> +Date: Wed, 1 Apr 2015 16:11:09 -0700 +Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) + +Switch to a single tunnel for all mappings, this removes the limitations +on how many mappings each tunnel can handle, and therefore how many Fan +slices each local address may hold. + +NOTE: This introduces a new kernel netlink interface which needs updated +iproute2 support. + +BugLink: http://bugs.launchpad.net/bugs/1470091 +Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> +Signed-off-by: Andy Whitcroft <apw@canonical.com> +Signed-off-by: Tim Gardner <tim.gardner@canonical.com> + +Conflicts: + include/net/ip_tunnels.h +--- + include/net/ip_tunnels.h | 15 ++++ + include/uapi/linux/if_tunnel.h | 20 +++++ + net/ipv4/ip_tunnel.c | 7 +- + net/ipv4/ipip.c | 186 +++++++++++++++++++++++++++++++++++++++-- + 4 files changed, 222 insertions(+), 6 deletions(-) + +diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h +index 62a750a..47fec59 100644 +--- a/include/net/ip_tunnels.h ++++ b/include/net/ip_tunnels.h +@@ -91,6 +91,19 @@ struct ip_tunnel_dst { + }; + + struct metadata_dst; ++/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 ++ * underlay (10.88.0.0/16, for example). Multiple local addresses within ++ * the /16 may be used, but a particular overlay may not span ++ * multiple underlay subnets. ++ * ++ * We store one underlay, indexed by the overlay's high order octet. ++ */ ++#define FAN_OVERLAY_CNT 256 ++ ++struct ip_tunnel_fan { ++/* u32 __rcu *map;*/ ++ u32 map[FAN_OVERLAY_CNT]; ++}; + + struct ip_tunnel { + struct ip_tunnel __rcu *next; +@@ -123,6 +136,7 @@ struct ip_tunnel { + #endif + struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ + unsigned int prl_count; /* # of entries in PRL */ ++ struct ip_tunnel_fan fan; + int ip_tnl_net_id; + struct gro_cells gro_cells; + bool collect_md; +@@ -143,6 +157,7 @@ struct ip_tunnel { + #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) + + #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) ++#define TUNNEL_FAN __cpu_to_be16(0x4000) + + struct tnl_ptk_info { + __be16 flags; +diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h +index af4de90..85a3e4b 100644 +--- a/include/uapi/linux/if_tunnel.h ++++ b/include/uapi/linux/if_tunnel.h +@@ -57,6 +57,10 @@ enum { + IFLA_IPTUN_ENCAP_FLAGS, + IFLA_IPTUN_ENCAP_SPORT, + IFLA_IPTUN_ENCAP_DPORT, ++ ++ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ ++ IFLA_IPTUN_FAN_MAP = 33, ++ + __IFLA_IPTUN_MAX, + }; + #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) +@@ -132,4 +136,20 @@ enum { + }; + + #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) ++ ++enum { ++ IFLA_FAN_UNSPEC, ++ IFLA_FAN_MAPPING, ++ __IFLA_FAN_MAX, ++}; ++ ++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) ++ ++struct ip_tunnel_fan_map { ++ __be32 underlay; ++ __be32 overlay; ++ __u16 underlay_prefix; ++ __u16 overlay_prefix; ++}; ++ + #endif /* _UAPI_IF_TUNNEL_H_ */ +diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c +index cbb51f3..7a6174b 100644 +--- a/net/ipv4/ip_tunnel.c ++++ b/net/ipv4/ip_tunnel.c +@@ -1110,6 +1110,11 @@ out: + } + EXPORT_SYMBOL_GPL(ip_tunnel_newlink); + ++static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) ++{ ++ return tunnel->parms.i_flags & TUNNEL_FAN; ++} ++ + int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], + struct ip_tunnel_parm *p) + { +@@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], + struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); + + if (dev == itn->fb_tunnel_dev) +- return -EINVAL; ++ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; + + t = ip_tunnel_find(itn, p, dev->type); + +diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c +index a09fb0d..56e8984 100644 +--- a/net/ipv4/ipip.c ++++ b/net/ipv4/ipip.c +@@ -107,6 +107,7 @@ + #include <linux/init.h> + #include <linux/netfilter_ipv4.h> + #include <linux/if_ether.h> ++#include <linux/inetdevice.h> + + #include <net/sock.h> + #include <net/ip.h> +@@ -208,6 +209,40 @@ drop: + return 0; + } + ++static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) ++{ ++ return tunnel->parms.i_flags & TUNNEL_FAN; ++} ++ ++/* ++ * Determine fan tunnel endpoint to send packet to, based on the inner IP ++ * address. For an overlay (inner) address Y.A.B.C, the transformation is ++ * F.G.A.B, where "F" and "G" are the first two octets of the underlay ++ * network (the network portion of a /16), "A" and "B" are the low order ++ * two octets of the underlay network host (the host portion of a /16), ++ * and "Y" is a configured first octet of the overlay network. ++ * ++ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay ++ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to ++ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts ++ * overlay network 99.6.7.0/24. ++ */ ++static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) ++{ ++ unsigned int overlay; ++ u32 daddr, underlay; ++ ++ daddr = ntohl(ip_hdr(skb)->daddr); ++ overlay = daddr >> 24; ++ underlay = tunnel->fan.map[overlay]; ++ if (!underlay) ++ return -EINVAL; ++ ++ *iph = tunnel->parms.iph; ++ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); ++ return 0; ++} ++ + /* + * This function assumes it is being called from dev_queue_xmit() + * and that skb is filled properly by that function. +@@ -215,7 +250,8 @@ drop: + static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) + { + struct ip_tunnel *tunnel = netdev_priv(dev); +- const struct iphdr *tiph = &tunnel->parms.iph; ++ const struct iphdr *tiph; ++ struct iphdr fiph; + + if (unlikely(skb->protocol != htons(ETH_P_IP))) + goto tx_error; +@@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) + if (IS_ERR(skb)) + goto out; + ++ if (ipip_tunnel_is_fan(tunnel)) { ++ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) ++ goto tx_error; ++ tiph = &fiph; ++ } else { ++ tiph = &tunnel->parms.iph; ++ } ++ + skb_set_inner_ipproto(skb, IPPROTO_IPIP); + + ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); +@@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], + return ret; + } + ++static void ipip_fan_free_map(struct ip_tunnel *t) ++{ ++ memset(&t->fan.map, 0, sizeof(t->fan.map)); ++} ++ ++static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) ++{ ++ u32 overlay, overlay_mask, underlay, underlay_mask; ++ ++ if ((map->underlay_prefix && map->underlay_prefix != 16) || ++ (map->overlay_prefix && map->overlay_prefix != 8)) ++ return -EINVAL; ++ ++ overlay = ntohl(map->overlay); ++ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); ++ ++ underlay = ntohl(map->underlay); ++ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); ++ ++ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) ++ return -EINVAL; ++ ++ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) ++ return -EINVAL; ++ ++ t->parms.i_flags |= TUNNEL_FAN; ++ ++ /* Special case: overlay 0 and underlay 0 clears all mappings */ ++ if (!overlay && !underlay) { ++ ipip_fan_free_map(t); ++ return 0; ++ } ++ ++ overlay >>= (32 - map->overlay_prefix); ++ t->fan.map[overlay] = underlay; ++ ++ return 0; ++} ++ ++ ++static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, ++ struct ip_tunnel_parm *parms) ++{ ++ struct ip_tunnel_fan_map *map; ++ struct nlattr *attr; ++ int rem, rv; ++ ++ if (!data[IFLA_IPTUN_FAN_MAP]) ++ return 0; ++ ++ if (parms->iph.daddr) ++ return -EINVAL; ++ ++ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { ++ map = nla_data(attr); ++ rv = ipip_fan_set_map(t, map); ++ if (rv) ++ return rv; ++ } ++ ++ return 0; ++} ++ + static int ipip_newlink(struct net *src_net, struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[]) + { + struct ip_tunnel_parm p; + struct ip_tunnel_encap ipencap; ++ struct ip_tunnel *t = netdev_priv(dev); ++ int err; + + if (ipip_netlink_encap_parms(data, &ipencap)) { +- struct ip_tunnel *t = netdev_priv(dev); +- int err = ip_tunnel_encap_setup(t, &ipencap); ++ err = ip_tunnel_encap_setup(t, &ipencap); + + if (err < 0) + return err; + } + + ipip_netlink_parms(data, &p); ++ err = ipip_netlink_fan(data, t, &p); ++ if (err < 0) ++ return err; + return ip_tunnel_newlink(dev, tb, &p); + } + +@@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], + { + struct ip_tunnel_parm p; + struct ip_tunnel_encap ipencap; ++ struct ip_tunnel *t = netdev_priv(dev); ++ int err; + + if (ipip_netlink_encap_parms(data, &ipencap)) { +- struct ip_tunnel *t = netdev_priv(dev); +- int err = ip_tunnel_encap_setup(t, &ipencap); ++ err = ip_tunnel_encap_setup(t, &ipencap); + + if (err < 0) + return err; + } + + ipip_netlink_parms(data, &p); ++ err = ipip_netlink_fan(data, t, &p); ++ if (err < 0) ++ return err; + + if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || + (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) +@@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev) + nla_total_size(2) + + /* IFLA_IPTUN_ENCAP_DPORT */ + nla_total_size(2) + ++ /* IFLA_IPTUN_FAN_MAP */ ++ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + + 0; + } + +@@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) + tunnel->encap.flags)) + goto nla_put_failure; + ++ if (tunnel->parms.i_flags & TUNNEL_FAN) { ++ struct nlattr *fan_nest; ++ int i; ++ ++ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); ++ if (!fan_nest) ++ goto nla_put_failure; ++ for (i = 0; i < 256; i++) { ++ if (tunnel->fan.map[i]) { ++ struct ip_tunnel_fan_map map; ++ ++ map.underlay = htonl(tunnel->fan.map[i]); ++ map.underlay_prefix = 16; ++ map.overlay = htonl(i << 24); ++ map.overlay_prefix = 8; ++ if (nla_put(skb, IFLA_FAN_MAPPING, ++ sizeof(map), &map)) ++ goto nla_put_failure; ++ } ++ } ++ nla_nest_end(skb, fan_nest); ++ } ++ + return 0; + + nla_put_failure: +@@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { + [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, + [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, + [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, ++ ++ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, ++ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, + }; + + static struct rtnl_link_ops ipip_link_ops __read_mostly = { +@@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = { + .size = sizeof(struct ip_tunnel_net), + }; + ++#ifdef CONFIG_SYSCTL ++static struct ctl_table_header *ipip_fan_header; ++static unsigned int ipip_fan_version = 3; ++ ++static struct ctl_table ipip_fan_sysctls[] = { ++ { ++ .procname = "version", ++ .data = &ipip_fan_version, ++ .maxlen = sizeof(ipip_fan_version), ++ .mode = 0444, ++ .proc_handler = proc_dointvec, ++ }, ++ {}, ++}; ++ ++#endif /* CONFIG_SYSCTL */ ++ + static int __init ipip_init(void) + { + int err; +@@ -541,9 +701,22 @@ static int __init ipip_init(void) + if (err < 0) + goto rtnl_link_failed; + ++#ifdef CONFIG_SYSCTL ++ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", ++ ipip_fan_sysctls); ++ if (!ipip_fan_header) { ++ err = -ENOMEM; ++ goto sysctl_failed; ++ } ++#endif /* CONFIG_SYSCTL */ ++ + out: + return err; + ++#ifdef CONFIG_SYSCTL ++sysctl_failed: ++ rtnl_link_unregister(&ipip_link_ops); ++#endif /* CONFIG_SYSCTL */ + rtnl_link_failed: + xfrm4_tunnel_deregister(&ipip_handler, AF_INET); + xfrm_tunnel_failed: +@@ -553,6 +726,9 @@ xfrm_tunnel_failed: + + static void __exit ipip_fini(void) + { ++#ifdef CONFIG_SYSCTL ++ unregister_net_sysctl_table(ipip_fan_header); ++#endif /* CONFIG_SYSCTL */ + rtnl_link_unregister(&ipip_link_ops); + if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) + pr_info("%s: can't deregister tunnel\n", __func__); +-- +2.7.4 + +From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001 +From: Jay Vosburgh <jay.vosburgh@canonical.com> +Date: Wed, 11 Nov 2015 13:04:50 +0000 +Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation + +Generify the fan mapping support and utilise that to implement fan +mappings over vxlan transport. + +Expose the existance of this functionality (when the module is loaded) +via an additional sysctl marker. + +Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> +[apw@canonical.com: added feature marker for fan over vxlan.] +Signed-off-by: Andy Whitcroft <apw@canonical.com> +--- + drivers/net/vxlan.c | 245 +++++++++++++++++++++++++++++++++++++++++ + include/net/ip_tunnels.h | 19 +++- + include/net/vxlan.h | 2 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_tunnel.h | 2 +- + net/ipv4/ip_tunnel.c | 7 +- + net/ipv4/ipip.c | 242 +++++++++++++++++++++++++++++++--------- + 7 files changed, 453 insertions(+), 65 deletions(-) + +diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c +index 405a7b6..a17cfd0 100644 +--- a/drivers/net/vxlan.c ++++ b/drivers/net/vxlan.c +@@ -23,6 +23,7 @@ + #include <linux/udp.h> + #include <linux/igmp.h> + #include <linux/etherdevice.h> ++#include <linux/inetdevice.h> + #include <linux/if_ether.h> + #include <linux/if_vlan.h> + #include <linux/hash.h> +@@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) + ip_tunnel_collect_metadata(); + } + ++static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr) ++{ ++ struct ip_fan_map *fan_map; ++ ++ rcu_read_lock(); ++ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { ++ if (fan_map->overlay == ++ (daddr & inet_make_mask(fan_map->overlay_prefix))) { ++ rcu_read_unlock(); ++ return fan_map; ++ } ++ } ++ rcu_read_unlock(); ++ ++ return NULL; ++} ++ ++static void vxlan_fan_flush_map(struct vxlan_dev *vxlan) ++{ ++ struct ip_fan_map *fan_map; ++ ++ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { ++ list_del_rcu(&fan_map->list); ++ kfree_rcu(fan_map, rcu); ++ } ++} ++ ++static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay) ++{ ++ struct ip_fan_map *fan_map; ++ ++ fan_map = vxlan_fan_find_map(vxlan, overlay); ++ if (!fan_map) ++ return -ENOENT; ++ ++ list_del_rcu(&fan_map->list); ++ kfree_rcu(fan_map, rcu); ++ ++ return 0; ++} ++ ++static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map) ++{ ++ __be32 overlay_mask, underlay_mask; ++ struct ip_fan_map *fan_map; ++ ++ overlay_mask = inet_make_mask(map->overlay_prefix); ++ underlay_mask = inet_make_mask(map->underlay_prefix); ++ ++ netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n", ++ map->overlay, map->overlay_prefix, ++ map->underlay, map->underlay_prefix, ++ overlay_mask, underlay_mask); ++ ++ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) ++ return -EINVAL; ++ ++ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) ++ return -EINVAL; ++ ++ /* Special case: overlay 0 and underlay 0: flush all mappings */ ++ if (!map->overlay && !map->underlay) { ++ vxlan_fan_flush_map(vxlan); ++ return 0; ++ } ++ ++ /* Special case: overlay set and underlay 0: clear map for overlay */ ++ if (!map->underlay) ++ return vxlan_fan_del_map(vxlan, map->overlay); ++ ++ if (vxlan_fan_find_map(vxlan, map->overlay)) ++ return -EEXIST; ++ ++ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); ++ fan_map->underlay = map->underlay; ++ fan_map->overlay = map->overlay; ++ fan_map->underlay_prefix = map->underlay_prefix; ++ fan_map->overlay_mask = ntohl(overlay_mask); ++ fan_map->overlay_prefix = map->overlay_prefix; ++ ++ list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps); ++ ++ return 0; ++} ++ ++static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan) ++{ ++ struct ifla_fan_map *map; ++ struct nlattr *attr; ++ int rem, rv; ++ ++ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { ++ map = nla_data(attr); ++ rv = vxlan_fan_add_map(vxlan, map); ++ if (rv) ++ return rv; ++ } ++ ++ return 0; ++} ++ ++static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb, ++ struct vxlan_rdst *fan_rdst) ++{ ++ struct ip_fan_map *f_map; ++ union vxlan_addr *va; ++ u32 daddr, underlay; ++ struct arphdr *arp; ++ void *arp_ptr; ++ struct ethhdr *eth; ++ struct iphdr *iph; ++ ++ eth = eth_hdr(skb); ++ switch (eth->h_proto) { ++ case htons(ETH_P_IP): ++ iph = ip_hdr(skb); ++ if (!iph) ++ return -EINVAL; ++ daddr = iph->daddr; ++ break; ++ case htons(ETH_P_ARP): ++ arp = arp_hdr(skb); ++ if (!arp) ++ return -EINVAL; ++ arp_ptr = arp + 1; ++ netdev_dbg(vxlan->dev, ++ "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n", ++ arp_ptr, arp_ptr + skb->dev->addr_len, ++ arp_ptr + skb->dev->addr_len + 4, ++ arp_ptr + (skb->dev->addr_len * 2) + 4); ++ arp_ptr += (skb->dev->addr_len * 2) + 4; ++ memcpy(&daddr, arp_ptr, 4); ++ break; ++ default: ++ netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto); ++ return -EINVAL; ++ } ++ ++ f_map = vxlan_fan_find_map(vxlan, daddr); ++ if (!f_map) ++ return -EINVAL; ++ ++ daddr = ntohl(daddr); ++ underlay = ntohl(f_map->underlay); ++ if (!underlay) ++ return -EINVAL; ++ ++ memset(fan_rdst, 0, sizeof(*fan_rdst)); ++ va = &fan_rdst->remote_ip; ++ va->sa.sa_family = AF_INET; ++ fan_rdst->remote_vni = vxlan->default_dst.remote_vni; ++ va->sin.sin_addr.s_addr = htonl(underlay | ++ ((daddr & ~f_map->overlay_mask) >> ++ (32 - f_map->overlay_prefix - ++ (32 - f_map->underlay_prefix)))); ++ netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n", ++ daddr, underlay, va->sin.sin_addr.s_addr); ++ ++ return 0; ++} ++ + #if IS_ENABLED(CONFIG_IPV6) + static inline + bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b) +@@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, + goto rt_tx_error; + } + ++ if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) { ++ netdev_dbg(dev, "discard fan to localhost %pI4\n", ++ &dst->sin.sin_addr.s_addr); ++ ip_rt_put(rt); ++ goto tx_free; ++ } ++ + /* Bypass encapsulation if the destination is local */ + if (rt->rt_flags & RTCF_LOCAL && + !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) { +@@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) + return NETDEV_TX_OK; + } + ++ if (fan_has_map(&vxlan->fan)) { ++ struct vxlan_rdst fan_rdst; ++ ++ netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n", ++ eth->h_proto, eth->h_dest); ++ if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) { ++ dev->stats.tx_dropped++; ++ kfree_skb(skb); ++ return NETDEV_TX_OK; ++ } ++ vxlan_xmit_one(skb, dev, &fan_rdst, 0); ++ return NETDEV_TX_OK; ++ } ++ + f = vxlan_find_mac(vxlan, eth->h_dest); + did_rsc = false; + +@@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev) + + for (h = 0; h < FDB_HASH_SIZE; ++h) + INIT_HLIST_HEAD(&vxlan->fdb_head[h]); ++ ++ INIT_LIST_HEAD(&vxlan->fan.fan_maps); + } + + static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = { +@@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create); + static int vxlan_newlink(struct net *src_net, struct net_device *dev, + struct nlattr *tb[], struct nlattr *data[]) + { ++ struct vxlan_dev *vxlan = netdev_priv(dev); + struct vxlan_config conf; + int err; + +@@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, + conf.remote_ip.sa.sa_family = AF_INET6; + } + ++ if (data[IFLA_VXLAN_FAN_MAP]) { ++ err = vxlan_parse_fan_map(data, vxlan); ++ if (err) ++ return err; ++ } ++ + if (data[IFLA_VXLAN_LOCAL]) { + conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]); + conf.saddr.sa.sa_family = AF_INET; +@@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev) + nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */ + nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */ + nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */ ++ nla_total_size(sizeof(struct ip_fan_map) * 256) + + 0; + } + +@@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) + } + } + ++ if (fan_has_map(&vxlan->fan)) { ++ struct nlattr *fan_nest; ++ struct ip_fan_map *fan_map; ++ ++ fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP); ++ if (!fan_nest) ++ goto nla_put_failure; ++ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { ++ struct ifla_fan_map map; ++ ++ map.underlay = fan_map->underlay; ++ map.underlay_prefix = fan_map->underlay_prefix; ++ map.overlay = fan_map->overlay; ++ map.overlay_prefix = fan_map->overlay_prefix; ++ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) ++ goto nla_put_failure; ++ } ++ nla_nest_end(skb, fan_nest); ++ } ++ + if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) || + nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) || + nla_put_u8(skb, IFLA_VXLAN_LEARNING, +@@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net) + return 0; + } + ++#ifdef CONFIG_SYSCTL ++static struct ctl_table_header *vxlan_fan_header; ++static unsigned int vxlan_fan_version = 4; ++ ++static struct ctl_table vxlan_fan_sysctls[] = { ++ { ++ .procname = "vxlan", ++ .data = &vxlan_fan_version, ++ .maxlen = sizeof(vxlan_fan_version), ++ .mode = 0444, ++ .proc_handler = proc_dointvec, ++ }, ++ {}, ++}; ++#endif /* CONFIG_SYSCTL */ ++ + static void __net_exit vxlan_exit_net(struct net *net) + { + struct vxlan_net *vn = net_generic(net, vxlan_net_id); +@@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void) + if (rc) + goto out3; + ++#ifdef CONFIG_SYSCTL ++ vxlan_fan_header = register_net_sysctl(&init_net, "net/fan", ++ vxlan_fan_sysctls); ++ if (!vxlan_fan_header) { ++ rc = -ENOMEM; ++ goto sysctl_failed; ++ } ++#endif /* CONFIG_SYSCTL */ ++ + return 0; ++#ifdef CONFIG_SYSCTL ++sysctl_failed: ++ rtnl_link_unregister(&vxlan_link_ops); ++#endif /* CONFIG_SYSCTL */ + out3: + unregister_netdevice_notifier(&vxlan_notifier_block); + out2: +@@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module); + + static void __exit vxlan_cleanup_module(void) + { ++#ifdef CONFIG_SYSCTL ++ unregister_net_sysctl_table(vxlan_fan_header); ++#endif /* CONFIG_SYSCTL */ + rtnl_link_unregister(&vxlan_link_ops); + unregister_netdevice_notifier(&vxlan_notifier_block); + destroy_workqueue(vxlan_wq); +diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h +index 47fec59..28a38e5 100644 +--- a/include/net/ip_tunnels.h ++++ b/include/net/ip_tunnels.h +@@ -100,9 +100,18 @@ struct metadata_dst; + */ + #define FAN_OVERLAY_CNT 256 + ++struct ip_fan_map { ++ __be32 underlay; ++ __be32 overlay; ++ u16 underlay_prefix; ++ u16 overlay_prefix; ++ u32 overlay_mask; ++ struct list_head list; ++ struct rcu_head rcu; ++}; ++ + struct ip_tunnel_fan { +-/* u32 __rcu *map;*/ +- u32 map[FAN_OVERLAY_CNT]; ++ struct list_head fan_maps; + }; + + struct ip_tunnel { +@@ -157,7 +166,11 @@ struct ip_tunnel { + #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) + + #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) +-#define TUNNEL_FAN __cpu_to_be16(0x4000) ++ ++static inline int fan_has_map(const struct ip_tunnel_fan *fan) ++{ ++ return !list_empty(&fan->fan_maps); ++} + + struct tnl_ptk_info { + __be16 flags; +diff --git a/include/net/vxlan.h b/include/net/vxlan.h +index e289ada..542f421 100644 +--- a/include/net/vxlan.h ++++ b/include/net/vxlan.h +@@ -161,6 +161,8 @@ struct vxlan_dev { + struct vxlan_rdst default_dst; /* default destination */ + u32 flags; /* VXLAN_F_* in vxlan.h */ + ++ struct ip_tunnel_fan fan; ++ + struct timer_list age_timer; + spinlock_t hash_lock; + unsigned int addrcnt; +diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h +index 5ad5737..6cde3bf 100644 +--- a/include/uapi/linux/if_link.h ++++ b/include/uapi/linux/if_link.h +@@ -443,6 +443,7 @@ enum { + IFLA_VXLAN_GBP, + IFLA_VXLAN_REMCSUM_NOPARTIAL, + IFLA_VXLAN_COLLECT_METADATA, ++ IFLA_VXLAN_FAN_MAP = 33, + __IFLA_VXLAN_MAX + }; + #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) +diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h +index 85a3e4b..d36b150 100644 +--- a/include/uapi/linux/if_tunnel.h ++++ b/include/uapi/linux/if_tunnel.h +@@ -145,7 +145,7 @@ enum { + + #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) + +-struct ip_tunnel_fan_map { ++struct ifla_fan_map { + __be32 underlay; + __be32 overlay; + __u16 underlay_prefix; +diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c +index 7a6174b..c821bf1 100644 +--- a/net/ipv4/ip_tunnel.c ++++ b/net/ipv4/ip_tunnel.c +@@ -1110,11 +1110,6 @@ out: + } + EXPORT_SYMBOL_GPL(ip_tunnel_newlink); + +-static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) +-{ +- return tunnel->parms.i_flags & TUNNEL_FAN; +-} +- + int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], + struct ip_tunnel_parm *p) + { +@@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], + struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); + + if (dev == itn->fb_tunnel_dev) +- return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; ++ return fan_has_map(&tunnel->fan) ? 0 : -EINVAL; + + t = ip_tunnel_find(itn, p, dev->type); + +diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c +index 56e8984..3877b0e 100644 +--- a/net/ipv4/ipip.c ++++ b/net/ipv4/ipip.c +@@ -108,6 +108,7 @@ + #include <linux/netfilter_ipv4.h> + #include <linux/if_ether.h> + #include <linux/inetdevice.h> ++#include <linux/rculist.h> + + #include <net/sock.h> + #include <net/ip.h> +@@ -209,37 +210,144 @@ drop: + return 0; + } + +-static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) ++static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr) + { +- return tunnel->parms.i_flags & TUNNEL_FAN; ++ struct ip_fan_map *fan_map; ++ ++ rcu_read_lock(); ++ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { ++ if (fan_map->overlay == ++ (daddr & inet_make_mask(fan_map->overlay_prefix))) { ++ rcu_read_unlock(); ++ return fan_map; ++ } ++ } ++ rcu_read_unlock(); ++ ++ return NULL; + } + +-/* +- * Determine fan tunnel endpoint to send packet to, based on the inner IP +- * address. For an overlay (inner) address Y.A.B.C, the transformation is +- * F.G.A.B, where "F" and "G" are the first two octets of the underlay +- * network (the network portion of a /16), "A" and "B" are the low order +- * two octets of the underlay network host (the host portion of a /16), +- * and "Y" is a configured first octet of the overlay network. ++/* Determine fan tunnel endpoint to send packet to, based on the inner IP ++ * address. ++ * ++ * Given a /8 overlay and /16 underlay, for an overlay (inner) address ++ * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first ++ * two octets of the underlay network (the network portion of a /16), "A" ++ * and "B" are the low order two octets of the underlay network host (the ++ * host portion of a /16), and "Y" is a configured first octet of the ++ * overlay network. ++ * ++ * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would ++ * host overlay subnet 99.3.4.0/24. An overlay network datagram from ++ * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7, ++ * which hosts overlay network subnet 99.6.7.0/24. This transformation is ++ * described in detail further below. ++ * ++ * Using netmasks for the overlay and underlay other than /8 and /16, as ++ * shown above, can yield larger (or smaller) overlay subnets, with the ++ * trade-off of allowing fewer (or more) underlay hosts to participate. ++ * ++ * The size of each overlay network subnet is defined by the total of the ++ * network mask of the overlay plus the size of host portion of the ++ * underlay network. In the above example, /8 + /16 = /24. ++ * ++ * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In ++ * this case, the network portion of the underlay is 10.99.224.0/20, and ++ * the host portion is 0.0.14.5 (12 bits). To determine the overlay ++ * network subnet, the 12 bits of host portion are left shifted 12 bits ++ * (/20 - /8) and ORed with the overlay subnet prefix. This yields an ++ * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by ++ * 12 bits underlay. This yields 12 bits in the overlay network portion, ++ * allowing for 4094 addresses in each overlay network subnet. The ++ * trade-off is that fewer hosts may participate in the underlay network, ++ * as its host address size has shrunk from 16 bits (65534 addresses) in ++ * the first example to 12 bits (4094 addresses) here. ++ * ++ * For fewer hosts per overlay subnet (permitting a larger number of ++ * underlay hosts to participate), the underlay netmask may be made ++ * smaller. ++ * ++ * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion ++ * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift ++ * the 20 bits of host by 4 (so that it's highest order bit is adjacent to ++ * the lowest order bit of the /8 overlay). This yields an overlay subnet ++ * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of ++ * the underlay). This provides more addresses for the underlay network ++ * (approximately 2^20), but each host's segment of the overlay provides ++ * only 4 bits of addresses (14 usable). ++ * ++ * It is also possible to adjust the overlay subnet. ++ * ++ * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider ++ * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left ++ * shifted 15 bits (/20 - /5), yielding an overlay network of ++ * 240.129.0.0/17. An underlay host of 10.88.244.215 would yield an ++ * overlay network of 242.107.128.0/17. ++ * ++ * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for ++ * underlay host 10.224.220.10, the underlay host portion (.10) is left ++ * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18. ++ * This would permit 254 addresses on the underlay, with each overlay ++ * segment providing approximately 2^14 - 2 addresses (16382). ++ * ++ * For packets being encapsulated, the overlay network destination IP ++ * address is deconstructed into its overlay and underlay-derived ++ * portions. The underlay portion (determined by the overlay mask and ++ * overlay subnet mask) is right shifted according to the size of the ++ * underlay network mask. This value is then ORed with the network ++ * portion of the underlay network to produce the underlay network ++ * destination for the encapsulated datagram. ++ * ++ * For example, using the initial example of underlay 10.88.3.4/16 and ++ * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay ++ * subnet 99.3.4.0/24 with specfic host 99.3.4.5. A datagram from ++ * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion ++ * of the address extracted. This is a number of bits equal to underlay ++ * network host portion. In the destination address, the highest order of ++ * these bits is one bit lower than the lowest order bit from the overlay ++ * network mask. ++ * ++ * Using the sample value, 99.6.7.8, the overlay mask is /8, and the ++ * underlay mask is /16 (leaving 16 bits for the host portion). The bits ++ * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8 ++ * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of ++ * which is 1 bit lower than the lowest order overlay address bit). + * +- * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay +- * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to +- * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts +- * overlay network 99.6.7.0/24. ++ * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7. ++ * This value is then ORed with the underlay network portion, ++ * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for ++ * the encapuslated datagram. ++ * ++ * Another transform using the final example: overlay 100.64.0.0/10 and ++ * underlay 10.224.220.0/24. Consider overlay address 100.66.128.1 ++ * sending a datagram to 100.66.200.5. In this case, 8 bits (the host ++ * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay ++ * prefix are masked off, yielding 0.2.192.0. This is right shifted 14 ++ * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay ++ * network portion and the underlay host portion) bits, yielding 0.0.0.11. ++ * This is ORed with the underlay network portion, 10.224.220.0/24, giving ++ * the underlay destination of 10.224.220.11 for overlay destination ++ * 100.66.200.5. + */ + static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) + { +- unsigned int overlay; ++ struct ip_fan_map *f_map; + u32 daddr, underlay; + ++ f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr); ++ if (!f_map) ++ return -ENOENT; ++ + daddr = ntohl(ip_hdr(skb)->daddr); +- overlay = daddr >> 24; +- underlay = tunnel->fan.map[overlay]; ++ underlay = ntohl(f_map->underlay); + if (!underlay) + return -EINVAL; + + *iph = tunnel->parms.iph; +- iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); ++ iph->daddr = htonl(underlay | ++ ((daddr & ~f_map->overlay_mask) >> ++ (32 - f_map->overlay_prefix - ++ (32 - f_map->underlay_prefix)))); + return 0; + } + +@@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) + if (IS_ERR(skb)) + goto out; + +- if (ipip_tunnel_is_fan(tunnel)) { ++ if (fan_has_map(&tunnel->fan)) { + if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) + goto tx_error; + tiph = &fiph; +@@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = { + + static void ipip_tunnel_setup(struct net_device *dev) + { ++ struct ip_tunnel *t = netdev_priv(dev); ++ + dev->netdev_ops = &ipip_netdev_ops; + + dev->type = ARPHRD_TUNNEL; +@@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev) + dev->features |= IPIP_FEATURES; + dev->hw_features |= IPIP_FEATURES; + ip_tunnel_setup(dev, ipip_net_id); ++ INIT_LIST_HEAD(&t->fan.fan_maps); + } + + static int ipip_tunnel_init(struct net_device *dev) +@@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], + return ret; + } + +-static void ipip_fan_free_map(struct ip_tunnel *t) ++static void ipip_fan_flush_map(struct ip_tunnel *t) + { +- memset(&t->fan.map, 0, sizeof(t->fan.map)); ++ struct ip_fan_map *fan_map; ++ ++ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { ++ list_del_rcu(&fan_map->list); ++ kfree_rcu(fan_map, rcu); ++ } + } + +-static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) ++static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay) + { +- u32 overlay, overlay_mask, underlay, underlay_mask; ++ struct ip_fan_map *fan_map; + +- if ((map->underlay_prefix && map->underlay_prefix != 16) || +- (map->overlay_prefix && map->overlay_prefix != 8)) +- return -EINVAL; ++ fan_map = ipip_fan_find_map(t, overlay); ++ if (!fan_map) ++ return -ENOENT; ++ ++ list_del_rcu(&fan_map->list); ++ kfree_rcu(fan_map, rcu); + +- overlay = ntohl(map->overlay); +- overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); ++ return 0; ++} + +- underlay = ntohl(map->underlay); +- underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); ++static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map) ++{ ++ __be32 overlay_mask, underlay_mask; ++ struct ip_fan_map *fan_map; + +- if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) +- return -EINVAL; ++ overlay_mask = inet_make_mask(map->overlay_prefix); ++ underlay_mask = inet_make_mask(map->underlay_prefix); + +- if (!(overlay & overlay_mask) && (underlay & underlay_mask)) ++ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) + return -EINVAL; + +- t->parms.i_flags |= TUNNEL_FAN; ++ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) ++ return -EINVAL; + +- /* Special case: overlay 0 and underlay 0 clears all mappings */ +- if (!overlay && !underlay) { +- ipip_fan_free_map(t); ++ /* Special case: overlay 0 and underlay 0: flush all mappings */ ++ if (!map->overlay && !map->underlay) { ++ ipip_fan_flush_map(t); + return 0; + } ++ ++ /* Special case: overlay set and underlay 0: clear map for overlay */ ++ if (!map->underlay) ++ return ipip_fan_del_map(t, map->overlay); ++ ++ if (ipip_fan_find_map(t, map->overlay)) ++ return -EEXIST; ++ ++ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); ++ fan_map->underlay = map->underlay; ++ fan_map->overlay = map->overlay; ++ fan_map->underlay_prefix = map->underlay_prefix; ++ fan_map->overlay_mask = ntohl(overlay_mask); ++ fan_map->overlay_prefix = map->overlay_prefix; + +- overlay >>= (32 - map->overlay_prefix); +- t->fan.map[overlay] = underlay; ++ list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps); + + return 0; + } +@@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) + static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, + struct ip_tunnel_parm *parms) + { +- struct ip_tunnel_fan_map *map; ++ struct ifla_fan_map *map; + struct nlattr *attr; + int rem, rv; + +@@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, + + nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { + map = nla_data(attr); +- rv = ipip_fan_set_map(t, map); ++ rv = ipip_fan_add_map(t, map); + if (rv) + return rv; + } +@@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev) + /* IFLA_IPTUN_ENCAP_DPORT */ + nla_total_size(2) + + /* IFLA_IPTUN_FAN_MAP */ +- nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + ++ nla_total_size(sizeof(struct ifla_fan_map)) * 256 + + 0; + } + +@@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) + tunnel->encap.flags)) + goto nla_put_failure; + +- if (tunnel->parms.i_flags & TUNNEL_FAN) { ++ if (fan_has_map(&tunnel->fan)) { + struct nlattr *fan_nest; +- int i; ++ struct ip_fan_map *fan_map; + + fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); + if (!fan_nest) + goto nla_put_failure; +- for (i = 0; i < 256; i++) { +- if (tunnel->fan.map[i]) { +- struct ip_tunnel_fan_map map; +- +- map.underlay = htonl(tunnel->fan.map[i]); +- map.underlay_prefix = 16; +- map.overlay = htonl(i << 24); +- map.overlay_prefix = 8; +- if (nla_put(skb, IFLA_FAN_MAPPING, +- sizeof(map), &map)) +- goto nla_put_failure; +- } ++ list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) { ++ struct ifla_fan_map map; ++ ++ map.underlay = fan_map->underlay; ++ map.underlay_prefix = fan_map->underlay_prefix; ++ map.overlay = fan_map->overlay; ++ map.overlay_prefix = fan_map->overlay_prefix; ++ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) ++ goto nla_put_failure; + } + nla_nest_end(skb, fan_nest); + } +-- +2.7.4 + diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch deleted file mode 100644 index 0050af6c25273..0000000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch +++ /dev/null @@ -1,616 +0,0 @@ -From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh <jay.vosburgh@canonical.com> -Date: Wed, 1 Apr 2015 16:11:09 -0700 -Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2) - -Modification to ipip tunnel driver to accept a new netlink option, -IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables -TX side destination address remapping for traffic entering the tunnel -(to be encapsulated). - -For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B, -where "F" and "G" are the first two octets of the underlay network (the -network portion of a /16), "A" and "B" are the low order two octets of the -underlay network host (the host portion of a /16), and "Y" is a configured -first octet of the overlay network. - -E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to 99.6.7.8 -would be directed to underlay host 10.88.6.7, which hosts overlay network -99.6.7.0/24. - -Includes net.fan.version sysctl as a sentinel for availability of the -fan functionality. - -NOTE: this requires an updated iproute2 to facilitate configuration of -the fan. - -BugLink: http://bugs.launchpad.net/bugs/1439706 -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -[apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing - with future feature additions.] -Signed-off-by: Andy Whitcroft <apw@canonical.com> ---- - include/net/ip_tunnels.h | 6 +++ - include/uapi/linux/if_tunnel.h | 4 ++ - net/ipv4/ipip.c | 112 +++++++++++++++++++++++++++++++++++++++-- - 3 files changed, 117 insertions(+), 5 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 25a59eb..d7eada2 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -51,6 +51,11 @@ struct ip_tunnel_dst { - __be32 saddr; - }; - -+/* Underlay address prefix for ipip fan mode */ -+struct ip_tunnel_fan { -+ u32 underlay; -+}; -+ - struct ip_tunnel { - struct ip_tunnel __rcu *next; - struct hlist_node hash_node; -@@ -82,6 +87,7 @@ struct ip_tunnel { - #endif - struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ - unsigned int prl_count; /* # of entries in PRL */ -+ struct ip_tunnel_fan fan; - int ip_tnl_net_id; - struct gro_cells gro_cells; - }; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index bd3cc11..8f7d269 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -57,6 +57,10 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, -+ -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_UNDERLAY=32, -+ - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 40403114..e3c27cd 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -209,13 +209,38 @@ drop: - } - - /* -+ * Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. For an overlay (inner) address Y.A.B.C, the transformation is -+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay -+ * network (the network portion of a /16), "A" and "B" are the low order -+ * two octets of the underlay network host (the host portion of a /16), -+ * and "Y" is a configured first octet of the overlay network. -+ * -+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -+ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -+ * overlay network 99.6.7.0/24. -+ */ -+static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+{ -+ u32 daddr; -+ -+ *iph = tunnel->parms.iph; -+ -+ daddr = ntohl(ip_hdr(skb)->daddr); -+ iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) | -+ ((daddr >> 8) & 0x0000ffff)); -+} -+ -+/* - * This function assumes it is being called from dev_queue_xmit() - * and that skb is filled properly by that function. - */ - static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct ip_tunnel *tunnel = netdev_priv(dev); -- const struct iphdr *tiph = &tunnel->parms.iph; -+ const struct iphdr *tiph; -+ struct iphdr fiph; - - if (unlikely(skb->protocol != htons(ETH_P_IP))) - goto tx_error; -@@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -+ if (tunnel->fan.underlay) { -+ ipip_build_fan_iphdr(tunnel, skb, &fiph); -+ tiph = &fiph; -+ } else { -+ tiph = &tunnel->parms.iph; -+ } -+ - skb_set_inner_ipproto(skb, IPPROTO_IPIP); - - ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); -@@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, -+ struct ip_tunnel_parm *parms) -+{ -+ u32 net = t->fan.underlay; -+ -+ if (!data[IFLA_IPTUN_FAN_UNDERLAY]) -+ goto err_check; -+ -+ net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000; -+ -+err_check: -+ if (parms->iph.daddr && net) -+ return -EINVAL; -+ -+ t->fan.underlay = net; -+ -+ return 0; -+} -+ - static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - return ip_tunnel_newlink(dev, tb, &p); - } - -@@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - - if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || - (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) -@@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -+ /* IFLA_IPTUN_FAN_UNDERLAY */ -+ nla_total_size(4) + - 0; - } - -@@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -+ if (tunnel->fan.underlay) -+ if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY, -+ htonl(tunnel->fan.underlay))) -+ goto nla_put_failure; -+ - return 0; - - nla_put_failure: -@@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, -+ -+ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -+ [IFLA_IPTUN_FAN_UNDERLAY] = { .type = NLA_U32 }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = { - .size = sizeof(struct ip_tunnel_net), - }; - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *ipip_fan_header; -+static unsigned int ipip_fan_version = 1; -+ -+static struct ctl_table ipip_fan_sysctls[] = { -+ { -+ .procname = "version", -+ .data = &ipip_fan_version, -+ .maxlen = sizeof(ipip_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+ -+#endif /* CONFIG_SYSCTL */ -+ - static int __init ipip_init(void) - { - int err; -@@ -542,9 +628,22 @@ static int __init ipip_init(void) - if (err < 0) - goto rtnl_link_failed; - -+#ifdef CONFIG_SYSCTL -+ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", -+ ipip_fan_sysctls); -+ if (!ipip_fan_header) { -+ err = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - out: - return err; - -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&ipip_link_ops); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_failed: - xfrm4_tunnel_deregister(&ipip_handler, AF_INET); - xfrm_tunnel_failed: -@@ -554,6 +653,9 @@ xfrm_tunnel_failed: - - static void __exit ipip_fini(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(ipip_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&ipip_link_ops); - if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) - pr_info("%s: can't deregister tunnel\n", __func__); --- -2.4.1 - -From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft <apw@canonical.com> -Date: Tue, 21 Jul 2015 16:52:10 +0100 -Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) - -Switch to a single tunnel for all mappings, this removes the limitations -on how many mappings each tunnel can handle, and therefore how many Fan -slices each local address may hold. - -NOTE: This introduces a new kernel netlink interface which needs updated -iproute2 support. - -BugLink: http://bugs.launchpad.net/bugs/1470091 -Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> -Signed-off-by: Andy Whitcroft <apw@canonical.com> -Acked-by: Tim Gardner <tim.gardner@canonical.com> -Acked-by: Brad Figg <brad.figg@canonical.com> -Signed-off-by: Brad Figg <brad.figg@canonical.com> ---- - include/net/ip_tunnels.h | 14 ++++- - include/uapi/linux/if_tunnel.h | 20 ++++++- - net/ipv4/ip_tunnel.c | 7 ++- - net/ipv4/ipip.c | 120 +++++++++++++++++++++++++++++++++-------- - 4 files changed, 133 insertions(+), 28 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index d7eada2..2f7bc8c 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -51,9 +51,18 @@ struct ip_tunnel_dst { - __be32 saddr; - }; - --/* Underlay address prefix for ipip fan mode */ -+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 -+ * underlay (10.88.0.0/16, for example). Multiple local addresses within -+ * the /16 may be used, but a particular overlay may not span -+ * multiple underlay subnets. -+ * -+ * We store one underlay, indexed by the overlay's high order octet. -+ */ -+#define FAN_OVERLAY_CNT 256 -+ - struct ip_tunnel_fan { -- u32 underlay; -+/* u32 __rcu *map;*/ -+ u32 map[FAN_OVERLAY_CNT]; - }; - - struct ip_tunnel { -@@ -104,6 +113,7 @@ struct ip_tunnel { - #define TUNNEL_OAM __cpu_to_be16(0x0200) - #define TUNNEL_CRIT_OPT __cpu_to_be16(0x0400) - #define TUNNEL_GENEVE_OPT __cpu_to_be16(0x0800) - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) -+#define TUNNEL_FAN __cpu_to_be16(0x4000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 8f7d269..9625934 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -58,8 +58,8 @@ enum { - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, - -- __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -- IFLA_IPTUN_FAN_UNDERLAY=32, -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_MAP = 33, - - __IFLA_IPTUN_MAX, - }; -@@ -135,4 +135,20 @@ enum { - }; - - #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+ -+enum { -+ IFLA_FAN_UNSPEC, -+ IFLA_FAN_MAPPING, -+ __IFLA_FAN_MAX, -+}; -+ -+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) -+ -+struct ip_tunnel_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ __u16 underlay_prefix; -+ __u16 overlay_prefix; -+}; -+ - #endif /* _UAPI_IF_TUNNEL_H_ */ -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index d3e4479..60bd10f 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1078,6 +1078,11 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - -+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return -EINVAL; -+ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index e3c27cd..d6ebc66 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -107,6 +107,7 @@ - #include <linux/init.h> - #include <linux/netfilter_ipv4.h> - #include <linux/if_ether.h> -+#include <linux/inetdevice.h> - - #include <net/sock.h> - #include <net/ip.h> -@@ -208,6 +209,11 @@ drop: - return 0; - } - -+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - /* - * Determine fan tunnel endpoint to send packet to, based on the inner IP - * address. For an overlay (inner) address Y.A.B.C, the transformation is -@@ -221,15 +227,20 @@ drop: - * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts - * overlay network 99.6.7.0/24. - */ --static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) - { -- u32 daddr; -- -- *iph = tunnel->parms.iph; -+ unsigned int overlay; -+ u32 daddr, underlay; - - daddr = ntohl(ip_hdr(skb)->daddr); -- iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) | -- ((daddr >> 8) & 0x0000ffff)); -+ overlay = daddr >> 24; -+ underlay = tunnel->fan.map[overlay]; -+ if (!underlay) -+ return -EINVAL; -+ -+ *iph = tunnel->parms.iph; -+ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ return 0; - } - - /* -@@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -- if (tunnel->fan.underlay) { -- ipip_build_fan_iphdr(tunnel, skb, &fiph); -+ if (ipip_tunnel_is_fan(tunnel)) { -+ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) -+ goto tx_error; - tiph = &fiph; - } else { - tiph = &tunnel->parms.iph; -@@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static void ipip_fan_free_map(struct ip_tunnel *t) -+{ -+ memset(&t->fan.map, 0, sizeof(t->fan.map)); -+} -+ -+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+{ -+ u32 overlay, overlay_mask, underlay, underlay_mask; -+ -+ if ((map->underlay_prefix && map->underlay_prefix != 16) || -+ (map->overlay_prefix && map->overlay_prefix != 8)) -+ return -EINVAL; -+ -+ overlay = ntohl(map->overlay); -+ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ -+ underlay = ntohl(map->underlay); -+ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+ -+ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ return -EINVAL; -+ -+ t->parms.i_flags |= TUNNEL_FAN; -+ -+ /* Special case: overlay 0 and underlay 0 clears all mappings */ -+ if (!overlay && !underlay) { -+ ipip_fan_free_map(t); -+ return 0; -+ } -+ -+ overlay >>= (32 - map->overlay_prefix); -+ t->fan.map[overlay] = underlay; -+ -+ return 0; -+} -+ -+ - static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - struct ip_tunnel_parm *parms) - { -- u32 net = t->fan.underlay; -- -- if (!data[IFLA_IPTUN_FAN_UNDERLAY]) -- goto err_check; -+ struct ip_tunnel_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; - -- net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000; -+ if (!data[IFLA_IPTUN_FAN_MAP]) -+ return 0; - --err_check: -- if (parms->iph.daddr && net) -+ if (parms->iph.daddr) - return -EINVAL; - -- t->fan.underlay = net; -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = ipip_fan_set_map(t, map); -+ if (rv) -+ return rv; -+ } - - return 0; - } -@@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -- /* IFLA_IPTUN_FAN_UNDERLAY */ -- nla_total_size(4) + -+ /* IFLA_IPTUN_FAN_MAP */ -+ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + - 0; - } - -@@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -- if (tunnel->fan.underlay) -- if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY, -- htonl(tunnel->fan.underlay))) -+ if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ struct nlattr *fan_nest; -+ int i; -+ -+ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); -+ if (!fan_nest) - goto nla_put_failure; -+ for (i = 0; i < 256; i++) { -+ if (tunnel->fan.map[i]) { -+ struct ip_tunnel_fan_map map; -+ -+ map.underlay = htonl(tunnel->fan.map[i]); -+ map.underlay_prefix = 16; -+ map.overlay = htonl(i << 24); -+ map.overlay_prefix = 8; -+ if (nla_put(skb, IFLA_FAN_MAPPING, -+ sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ } -+ nla_nest_end(skb, fan_nest); -+ } - - return 0; - -@@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, - - [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -- [IFLA_IPTUN_FAN_UNDERLAY] = { .type = NLA_U32 }, -+ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = { - - #ifdef CONFIG_SYSCTL - static struct ctl_table_header *ipip_fan_header; --static unsigned int ipip_fan_version = 1; -+static unsigned int ipip_fan_version = 3; - - static struct ctl_table ipip_fan_sysctls[] = { - { --- -2.4.1 - diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index 066b4fcb4e063..2ce833d104fdf 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation { name = "${klibc.name}"; buildCommand = '' mkdir -p $out/lib - cp -prd ${klibc}/lib/klibc/bin $out/ - cp -p ${klibc}/lib/*.so $out/lib/ + cp -prd ${klibc.out}/lib/klibc/bin $out/ + cp -p ${klibc.out}/lib/*.so $out/lib/ chmod +w $out/* - old=$(echo ${klibc}/lib/klibc-*.so) + old=$(echo ${klibc.out}/lib/klibc-*.so) new=$(echo $out/lib/klibc-*.so) for i in $out/bin/*; do echo $i diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 8157270d67d7d..c8484babcdf83 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -3,12 +3,14 @@ stdenv.mkDerivation rec { name = "libcap-${version}"; version = "2.24"; - + src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; sha256 = "0rbc9qbqs5bp9am9s9g83wxj5k4ixps2agy9dxr1v1fwg27mdr6f"; }; - + + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ attr ]; @@ -16,14 +18,11 @@ stdenv.mkDerivation rec { makeFlags = "lib=lib prefix=$(out)"; - passthru = { - postinst = n : '' - mkdir -p $out/share/doc/${n} - cp ../License $out/share/doc/${n}/License - ''; - }; - - postInstall = passthru.postinst name; + postInstall = '' + rm "$out"/lib/*.a + mkdir -p "$dev/share/doc/${name}" + cp ../License "$dev/share/doc/${name}/License" + ''; meta = { description = "Library for working with POSIX capabilities"; diff --git a/pkgs/os-specific/linux/libcap/man.nix b/pkgs/os-specific/linux/libcap/man.nix index 9aac3c4e1f5a0..eeb780f095bdc 100644 --- a/pkgs/os-specific/linux/libcap/man.nix +++ b/pkgs/os-specific/linux/libcap/man.nix @@ -10,6 +10,4 @@ stdenv.mkDerivation rec { makeFlags = "MANDIR=$(out)/share/man"; preConfigure = "cd doc"; - - postInstall = libcap.postinst name; } diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix index b78f32dccbb44..3dd7cd947af22 100644 --- a/pkgs/os-specific/linux/libcap/pam.nix +++ b/pkgs/os-specific/linux/libcap/pam.nix @@ -12,6 +12,4 @@ stdenv.mkDerivation rec { preConfigure = "cd pam_cap"; makeFlags = "${libcap.makeFlags} PAM_CAP=yes"; - - postInstall = libcap.postinst name; } diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index ae4446c82e6cf..e3871f15f885c 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { installFlags = "RAISE_SETFCAP=no"; - postInstall = libcap.postinst name; + postInstall = '' + mkdir -p "$out/share/doc/${name}" + cp ../License "$out/share/doc/${name}/" + ''; } diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index afd9695420e3c..1e1ed0a6112c0 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation { owner = "thom311"; }; + outputs = [ "dev" "bin" "out" "man" ]; + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; meta = { diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 351c2f6098142..9147cb813714b 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: +{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, enable_dmeventd ? false }: let version = "2.02.140"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ udev ]; + buildInputs = [ libudev ]; preConfigure = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation { --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/sbin/lvm $out/sbin/lvm \ - --replace /usr/bin/udevadm ${udev}/bin/udevadm + --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index fcfe4975fd721..4ac5d0c7951c0 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "1.1.5"; + version = "2.0.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1gnhgs4i2zamfdydj895inr9i072658wd47nf1ryw5710hdsv24m"; + sha256 = "1r0hgk91n3frrmla1681l74ag5sngbbkdagvjfqzxwcf9l8pwwsv"; }; nativeBuildInputs = [ @@ -29,10 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/3db8dd39a797f87f8b348f1b6b44953a25f3f170.patch"; - sha256 = "0scbzm9dqqhqsl0ri8da8a34r4qj9ph0cg68l9s7gw01vpvqbs8l"; - }) ]; XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; @@ -40,7 +36,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--enable-doc" "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch index 4662ca2e50480..16715992d35f3 100644 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ b/pkgs/os-specific/linux/lxc/support-db2x.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 92a4690..4dd341b 100644 +index 84f8699..dce9033 100644 --- a/configure.ac +++ b/configure.ac -@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then +@@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then AC_SUBST(db2xman) fi AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index cd2cd511435fe..254a5ce4e287d 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "135"; + version = "136"; src = fetchFromGitHub { - sha256 = "1bkbcb2zz7x7q893f1r8bm783jb3v7ww1yqys1hmqzn40hdwfr8p"; + sha256 = "0bk46vi39cifahqwrkzivqf4fr34aqfip960x7awks9hiil8skwr"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 465dc58199ed4..3fe9d462412c6 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # This is to avoid self-references, which causes the initrd to explode # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.glibc ]; + allowedReferences = [ stdenv.glibc.out ]; patches = [ ./no-self-references.patch ]; diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 1302d7b1fef05..ded6e77e43b41 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }: +assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux); + stdenv.mkDerivation { name = "module-init-tools-3.16"; @@ -20,6 +22,8 @@ stdenv.mkDerivation { }) ]; + buildInputs = [ stdenv.glibc.dev stdenv.glibc.static ]; + SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat"; patches = [ ./module-dir.patch ./docbook2man.patch ]; @@ -29,5 +33,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; description = "Tools for loading and managing Linux kernel modules"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 0dde3bca4e475..504d3790d868a 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--with-statedir=/var/lib/nfs" "--with-tirpcinclude=${libtirpc}/include/tirpc" ] - ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen"; + ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; patchPhase = '' diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 5bb757a73a06e..7da890ae7e33a 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; + neededLibs = map (p: p.out) + [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index f7cadd469d70f..d84c6224eebe4 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -9,10 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl"; }; + outputs = [ "out" "doc" "man" /* "modules" */ ]; + nativeBuildInputs = [ flex ]; buildInputs = [ cracklib ]; + enableParallelBuilding = true; + crossAttrs = { propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' @@ -31,7 +35,14 @@ stdenv.mkDerivation rec { postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd - ''; + ''; /* + rm -rf $out/etc + mkdir -p $modules/lib + mv $out/lib/security $modules/lib/ + '';*/ + # don't move modules, because libpam needs to (be able to) find them, + # which is done by dlopening $out/lib/security/pam_foo.so + # $out/etc was also missed: pam_env(login:session): Unable to open config file preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 225515cb70a23..a686bd5496d7a 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp pipework $out/bin wrapProgram $out/bin/pipework --prefix PATH : \ - ${lib.makeSearchPath "bin" [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; + ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 4fb7fc8cb0b80..19315ec2d0ba2 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -3,10 +3,10 @@ let - binPath = stdenv.lib.makeSearchPath "bin" + binPath = stdenv.lib.makeBinPath [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; - sbinPath = stdenv.lib.makeSearchPath "sbin" + sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] [ procps ]; in diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index f928dc8e657c6..321e94e3aaf42 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { preBuild = assert glibc != null; '' - substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd + substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd ''; postInstall = diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 358f7d38efa4b..99b869abcb0ee 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -2,14 +2,14 @@ let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; - version = "0.8.0"; + version = "0.9.0"; in stdenv.mkDerivation { - name="${baseName}-${version}"; + name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "1939k3clwxg09m1bn0szqiy2nxg66srl72n7476jc58hgaraq3dr"; + sha256 = "198x1zmlydvi4i1sfvs8xjh9z5pb47l6xs4phrnkwwak46rhka3j"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 6544210b20674..16431c465c168 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program - export BZIP=${bzip2}/bin/bzip2 + export BZIP=${bzip2.bin}/bin/bzip2 export SYSTEMCTL=systemctl ''; diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix new file mode 100644 index 0000000000000..2935990755c69 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -0,0 +1,25 @@ +{ stdenv, systemd, cryptsetup }: + +assert stdenv.isLinux; + +stdenv.lib.overrideDerivation systemd (p: { + version = p.version; + name = "systemd-cryptsetup-generator"; + + nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; + outputs = [ "out" ]; + + buildPhase = '' + make $makeFlags built-sources + make $makeFlags systemd-cryptsetup + make $makeFlags systemd-cryptsetup-generator + ''; + + installPhase = '' + mkdir -p $out/lib/systemd/ + cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup + + mkdir -p $out/lib/systemd/system-generators/ + cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator + ''; +}) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cb1521a4005e3..0f066e380c1b1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod -, xz, pam, acl, cryptsetup, libuuid, m4, utillinuxMinimal +{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod +, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders, libseccomp , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 @@ -19,18 +19,27 @@ stdenv.mkDerivation rec { sha256 = "1q0pyrljmq73qcan9rfqsiw66l1g159m5in5qgb8zwlwhl928670"; }; - outputs = [ "out" "man" "doc" ]; + patches = [ ./hwdb-location.diff ]; + + /* gave up for now! + outputs = [ "out" "libudev" "doc" ]; # maybe: "dev" + # note: there are many references to ${systemd}/... + outputDev = "out"; + propagatedBuildOutputs = "libudev"; + */ + outputs = [ "out" "man" ]; buildInputs = [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror - libmicrohttpd kexectools libseccomp audit lz4 libapparmor + libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not worth it. */ autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; + configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" @@ -74,14 +83,15 @@ stdenv.mkDerivation rec { for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do test -e $i substituteInPlace $i \ - --replace /usr/bin/getent ${stdenv.glibc}/bin/getent \ - --replace /bin/mount ${utillinuxMinimal}/bin/mount \ - --replace /bin/umount ${utillinuxMinimal}/bin/umount \ - --replace /sbin/swapon ${utillinuxMinimal}/sbin/swapon \ - --replace /sbin/swapoff ${utillinuxMinimal}/sbin/swapoff \ + --replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \ + --replace /bin/mount ${utillinux.bin}/bin/mount \ + --replace /bin/umount ${utillinux.bin}/bin/umount \ + --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinuxMinimal}/sbin/sulogin \ + --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck done @@ -89,12 +99,24 @@ stdenv.mkDerivation rec { --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + + #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib" ''; + /* + makeFlags = [ + "udevlibexecdir=$(libudev)/lib/udev" + # udev rules refer to $out, and anything but libs should probably go to $out + "udevrulesdir=$(out)/lib/udev/rules.d" + "udevhwdbdir=$(out)/lib/udev/hwdb.d" + ]; + */ + + PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit}/bin/pkttyagent here because that would + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would # lead to a cyclic dependency. "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" @@ -147,8 +169,30 @@ stdenv.mkDerivation rec { # "kernel-install" shouldn't be used on NixOS. find $out -name "*kernel-install*" -exec rm {} \; ''; # */ + /* + # Move lib(g)udev to a separate output. TODO: maybe split them up + # to avoid libudev pulling glib + mkdir -p "$libudev/lib" + mv "$out"/lib/lib{,g}udev* "$libudev/lib/" + + for i in "$libudev"/lib/*.la; do + substituteInPlace $i --replace "$out" "$libudev" + done + for i in "$out"/lib/pkgconfig/{libudev,gudev-1.0}.pc; do + substituteInPlace $i --replace "libdir=$out" "libdir=$libudev" + done + */ enableParallelBuilding = true; + /* + # some libs fail to link to liblzma and/or libffi + postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ]; + in '' + for f in "$out"/lib/*.so.0.*; do + patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f" + done + ''; + */ # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is @@ -165,3 +209,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; }; } + diff --git a/pkgs/os-specific/linux/systemd/hwdb-location.diff b/pkgs/os-specific/linux/systemd/hwdb-location.diff new file mode 100644 index 0000000000000..31e7a027f50d7 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/hwdb-location.diff @@ -0,0 +1,19 @@ +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index 06c9831..e74825c 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -268,13 +268,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { + } + + static const char hwdb_bin_paths[] = +- "/etc/systemd/hwdb/hwdb.bin\0" + "/etc/udev/hwdb.bin\0" +- "/usr/lib/systemd/hwdb/hwdb.bin\0" +-#ifdef HAVE_SPLIT_USR +- "/lib/systemd/hwdb/hwdb.bin\0" +-#endif +- UDEVLIBEXECDIR "/hwdb.bin\0"; ++ ; + + _public_ int sd_hwdb_new(sd_hwdb **ret) { + _cleanup_hwdb_unref_ sd_hwdb *hwdb = NULL; diff --git a/pkgs/os-specific/linux/systemd/libudev.nix b/pkgs/os-specific/linux/systemd/libudev.nix new file mode 100644 index 0000000000000..0fe45aee91642 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/libudev.nix @@ -0,0 +1,19 @@ +{ stdenv, systemd }: + +stdenv.mkDerivation { + name = "libudev-${systemd.version}"; + + unpackPhase = ":"; + outputs = [ "dev" "out" ]; + installPhase = '' + mkdir -p "$out/lib" "$dev/lib/pkgconfig" "$dev/include" + cp -P "${systemd}"/lib/libudev.* "$out/lib/" + cp -P "${systemd}"/lib/pkgconfig/libudev.pc "$dev/lib/pkgconfig/" + cp -P "${systemd}"/include/libudev.h "$dev/include/" + + substituteInPlace "$dev"/lib/pkgconfig/*.pc \ + --replace "${systemd}" "$out" + sed "/^includedir=/cincludedir=$dev/include" -i "$dev"/lib/pkgconfig/*.pc + ''; +} + diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix new file mode 100644 index 0000000000000..6dd551e1ce13e --- /dev/null +++ b/pkgs/os-specific/linux/udev/145.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }: + +assert stdenv ? glibc; + +stdenv.mkDerivation rec { + name = "udev-145"; + + src = fetchurl { + url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; + sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv"; + }; + + buildInputs = [gperf pkgconfig glib acl libusb usbutils]; + + configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids"; + + preConfigure = + '' + substituteInPlace extras/keymap/Makefile.in \ + --replace /usr/include ${stdenv.glibc.dev}/include + ''; + + postInstall = + '' + # Install some rules that really should be installed by default. + for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do + cp rules/packages/$i $out/libexec/rules.d/ + done + + # The path to rule_generator.functions in write_cd_rules and + # write_net_rules is broken. Also, don't store the mutable + # persistant rules in /etc/udev/rules.d but in + # /var/lib/udev/rules.d. + for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do + substituteInPlace $i \ + --replace /lib/udev $out/libexec \ + --replace /etc/udev/rules.d /var/lib/udev/rules.d + done + + # Don't set PATH to /bin:/sbin; won't work in NixOS. + substituteInPlace $out/libexec/rule_generator.functions \ + --replace 'PATH=' '#PATH=' + + # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the + # environment of the caller. + sed '3,4d' -i $out/libexec/firmware.sh + ''; + + meta = { + homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; + description = "Udev manages the /dev filesystem"; + }; +} diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index a84740b1a30b1..263fa4490dc8b 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam, systemd ? null -, pkgconfig -}: +{ stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd }: stdenv.mkDerivation rec { name = "util-linux-2.27.1"; @@ -10,12 +8,15 @@ stdenv.mkDerivation rec { sha256 = "1452hz5zx56a3mad8yrg5wb0vy5zi19mpjp6zx1yr6p9xp6qz08a"; }; - outputs = [ "out" "man" ]; - patches = [ ./rtcwake-search-PATH-for-shutdown.patch ]; + outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now + # due to lots of ${utillinux}/bin occurences and headers being rather small + outputDev = "bin"; + + #FIXME: make it also work on non-nixos? postPatch = '' # Substituting store paths would create a circular dependency on systemd @@ -46,6 +47,9 @@ stdenv.mkDerivation rec { ''} ''; + makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib pam ] ++ stdenv.lib.optional (ncurses != null) ncurses @@ -53,15 +57,16 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (perl != null) perl; postInstall = '' - rm $out/bin/su # su should be supplied by the su package (shadow) + rm "$bin/bin/su" # su should be supplied by the su package (shadow) ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.kernel.org/pub/linux/utils/util-linux/; description = "A set of system utilities for Linux"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; # also contains parts under more permissive licenses + platforms = platforms.linux; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages }; } diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d11ef186c319a..646e50c78f957 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ edf rootServer "root-server" ++ edf rrtypes "draft-rrtypes" ++ edf zoneStats "zone-stats" - ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; + ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ]; meta = with stdenv.lib; { homepage = http://www.nlnetlabs.nl; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix new file mode 100644 index 0000000000000..0cbf920cb72a1 --- /dev/null +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pure-ftpd-1.0.42"; + + src = fetchurl { + url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; + sha256 = "1yg7v1l3ng7c08nhh804k28y1f8ccmg0rq1a9l2sg45ib273mrvv"; + }; + + meta = with stdenv.lib; { + description = "A free, secure, production-quality and standard-conformant FTP server"; + homepage = https://www.pureftpd.org; + license = licenses.isc; # with some parts covered by BSD3(?) + maintainers = [ maintainers.lethalman ]; + }; + +} diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 99d6fe12aa1c2..bb4fa9782d6a2 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl, zlib +{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib , sslSupport, proxySupport ? true , apr, aprutil, pcre , ldapSupport ? true, openldap @@ -20,17 +20,24 @@ stdenv.mkDerivation rec { sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; }; - buildInputs = [perl apr aprutil pcre] ++ - stdenv.lib.optional sslSupport openssl; + # FIXME: -dev depends on -doc + outputs = [ "dev" "out" "doc" ]; + setOutputFlags = false; # it would move $out/modules, etc. - # An apr-util header file includes an apr header file - # through #include "" (quotes) - # passing simply CFLAGS did not help, then I go by NIX_CFLAGS_COMPILE - NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1"; + propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often + buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++ + stdenv.lib.optional sslSupport openssl; # Required for ‘pthread_cancel’. NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); + patchPhase = '' + sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" + ''; + + preConfigure = '' + configureFlags="$configureFlags --includedir=$dev/include" + ''; configureFlags = '' --with-z=${zlib} --with-pcre=${pcre} @@ -44,13 +51,18 @@ stdenv.mkDerivation rec { --enable-disk-cache --enable-file-cache --enable-mem-cache + --docdir=$(doc)/share/doc ''; enableParallelBuilding = true; + stripDebugList = "lib modules bin"; + postInstall = '' - echo "removing manual" - rm -rf $out/manual + mkdir -p $doc/share/doc/httpd + mv $out/manual $doc/share/doc/httpd + mkdir -p $dev/bin + mv $out/bin/apxs $dev/bin/apxs ''; passthru = { diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index a2e039bd399ff..a39d0e8e3158f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -24,15 +24,27 @@ stdenv.mkDerivation rec { sha256 = "0k7xm6ldzvakzq39nw6b39190ihlkc28all2gkvckxa1vr8b0i06"; }; + # FIXME: -dev depends on -doc + outputs = [ "dev" "out" "doc" ]; + setOutputFlags = false; # it would move $out/modules, etc. + buildInputs = [perl] ++ + optional sslSupport openssl ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2 ++ optional http2Support libnghttp2 ++ optional stdenv.isDarwin libiconv; + patchPhase = '' + sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" + ''; + # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + preConfigure = '' + configureFlags="$configureFlags --includedir=$dev/include" + ''; configureFlags = '' --with-apr=${apr} --with-apr-util=${aprutil} @@ -46,19 +58,22 @@ stdenv.mkDerivation rec { --enable-imagemap --enable-cgi ${optionalString proxySupport "--enable-proxy"} - ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} + ${optionalString sslSupport "--enable-ssl"} ${optionalString http2Support "--enable-http2 --with-nghttp2=${libnghttp2}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} - ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} + ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} + --docdir=$(doc)/share/doc ''; + enableParallelBuilding = true; + postInstall = '' - echo "removing manual" - rm -rf $out/manual + mkdir -p $doc/share/doc/httpd + mv $out/manual $doc/share/doc/httpd + mkdir -p $dev/bin + mv $out/bin/apxs $dev/bin/apxs ''; - enableParallelBuilding = true; - passthru = { inherit apr aprutil sslSupport proxySupport ldapSupport; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index e70c3105408fc..178900570d07b 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preBuild = '' cp Makefile.AP2 Makefile - makeFlags="top_dir=${apacheHttpd} prefix=$out" + makeFlags="top_dir=${apacheHttpd}/share prefix=$out" ''; meta = { diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 22ce5e7544583..ed13ae0bea7fd 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { [ "--with-file-aio" "--with-aio_module" ] ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 5adfb55cb2fdf..05cc58e41487f 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -8,10 +8,10 @@ with stdenv.lib; let - version = "1.9.11"; + version = "1.9.14"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "07x5d2ryf547xrj4wp8w90kz2d93sxjhkfjb0vdscmxgmzs74p3a"; + sha256 = "1ljpyigqb6sbm4f8mi4fyvwfcvfapzg4z35s9cwb9ri8dl3r6j1b"; }; in @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index b007c09b0560b..674557d74fc21 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 14f95761cfb1c..147e24c014d27 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" - export PATH="$PATH:${stdenv.cc.libc}/sbin" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags" + export PATH="$PATH:${stdenv.cc.libc.bin}/bin" patchShebangs . ''; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 706911aeef15b..030aa486daa76 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.26"; + version = "2.27"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "1idlpnwrd5fpmnfh477h1lzanavx8jxir2d8adax46zy472dg4s6"; + sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i"; }; prePatch = '' diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index d00bcb7ef1a27..6ecad81973ba1 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, bison, flex, openssl }: +{ stdenv, fetchFromGitHub, bison, flex, openssl }: stdenv.mkDerivation rec { - name = "charybdis-3.5.0-rc1"; + name = "charybdis-3.5.1"; - src = fetchgit { - url = "https://github.com/atheme/charybdis.git"; - rev = "43a9b61c427cd0f3fa2c192890b8a48d9ea6fb7f"; - sha256 = "ae2c8a72e6a29c901f9b51759b542ee12c4ec918050a2d9d65e5635077a0fcef"; + src = fetchFromGitHub { + owner = "charybdis-ircd"; + repo = "charybdis"; + rev = name; + sha256 = "12lwfcgszama7140l1qhmhf1v05csipswrvqzmg8pkaazbag4ka7"; }; patches = [ @@ -24,13 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex openssl ]; - meta = { - description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys"; - homepage = https://github.com/atheme/charybdis; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.lassulus ]; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "IRCv3 server designed to be highly scalable"; + homepage = http://www.charybdis.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ lassulus fpletz ]; + platforms = platforms.unix; }; - } diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 99f8d45b4c1d8..3cd3ca7492dd3 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -15,7 +15,7 @@ let ++ lib.optional withSQLite "sqlite3_drv" ++ lib.optional withDB "libdb4_drv" ); - maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ]; + maintenancePath = lib.makeBinPath [ gawk gnused gnugrep coreutils which ]; in stdenv.mkDerivation rec { name = "dspam-3.10.2"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 5e3f084674b29..94bc9f2bfe98e 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=smtpd" "--with-queue-user=smtpq" "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" - "--with-libevent-dir=${libevent}" + "--with-libevent-dir=${libevent.dev}" "--enable-table-db" ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 5e13b4520c9b6..7412378f3dec9 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { popd substituteInPlace $out/tools/cli/main.js \ --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib}/lib" \ + --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib.out}/lib" \ --replace "@PATCHELF@" "${patchelf}/bin/patchelf" # Patch node. @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { for p in $devBundle/mongodb/bin/mongo{,d}; do patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib}/lib" \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib.out}/lib" \ $p done diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index f2533c99b083d..816ac1bdb25e2 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + for f in $out/lib/*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do + sed 's|-L${openssl}|-L${openssl.out}|g' -i $f + done + ''; + meta = with stdenv.lib; { description = "Clients and server for the SNMP network monitoring protocol"; homepage = http://net-snmp.sourceforge.net/; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 7ccd29bc783a3..ffcd507653a0e 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { openssl zlib python gyp go readline ]; + configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; patchPhase = '' substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix index 448d260bdb9d6..ccd64da3c6a84 100644 --- a/pkgs/servers/nosql/mongodb/2.4.8.nix +++ b/pkgs/servers/nosql/mongodb/2.4.8.nix @@ -2,7 +2,7 @@ # by elitak for use with the Ubiquiti mFi Controller package, which breaks at # runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old # versions of boost and v8 to build this, as well. -{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre, snappy }: +{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre-cpp, snappy }: with stdenv.lib; let version = "2.4.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; }; - nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre snappy ]; + nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre-cpp snappy ]; postPatch = '' substituteInPlace SConstruct \ diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 1ef79f2ebcdcf..fd28776909c7b 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre, snappy +{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger }: @@ -21,7 +21,7 @@ let version = "3.2.1"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; buildInputs = [ - sasl boost gperftools pcre snappy + sasl boost gperftools pcre-cpp snappy zlib libyamlcpp sasl openssl libpcap ]; # ++ optional stdenv.is64bit wiredtiger; @@ -50,12 +50,18 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scons ]; inherit buildInputs; - # When not building with the system valgrind, the build should use the - # vendored header file - regardless of whether or not we're using the system - # tcmalloc - so we need to lift the include path manipulation out of the - # conditional. patches = - [ ./valgrind-include.patch + [ + # When not building with the system valgrind, the build should use the + # vendored header file - regardless of whether or not we're using the system + # tcmalloc - so we need to lift the include path manipulation out of the + # conditional. + ./valgrind-include.patch + + # MongoDB keeps track of its build parameters, which tricks nix into + # keeping dependencies to build inputs in the final output. + # We remove the build flags from buildInfo data. + ./forget-build-dependencies.patch (fetchpatch { url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb; name = "boost160.patch"; diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch new file mode 100644 index 0000000000000..ca2c043deb2d3 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch @@ -0,0 +1,17 @@ +--- a/site_scons/mongo_scons_utils.py ++++ b/site_scons/mongo_scons_utils.py +@@ -84,14 +84,11 @@ + def default_buildinfo_environment_data(): + return ( + ('distmod', '$MONGO_DISTMOD', True, True,), + ('distarch', '$MONGO_DISTARCH', True, True,), + ('cc', '$CC_VERSION', True, False,), +- ('ccflags', '$CCFLAGS', True, False,), + ('cxx', '$CXX_VERSION', True, False,), +- ('cxxflags', '$CXXFLAGS', True, False,), +- ('linkflags', '$LINKFLAGS', True, False,), + ('target_arch', '$TARGET_ARCH', True, True,), + ('target_os', '$TARGET_OS', True, False,), + ) + + # If you want buildInfo and --version to be relatively empty, set diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 3375ec2240bbf..52a7941d0932f 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { for i in `grep -l -R '/usr/\(include\|src\)' .`; do echo "Patch /usr/include and /usr/src in $i" substituteInPlace $i \ - --replace "/usr/include" "${glibc}/include" \ + --replace "/usr/include" "${glibc.dev}/include" \ --replace "/usr/src" "$TMP" done diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 11f1bc4a988c5..22a5c852e15d3 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -5,13 +5,13 @@ let plexpkg = if enablePlexPass then { - version = "0.9.16.3.1840"; - vsnHash = "cece46d"; - sha256 = "0p1rnia18a67h05f7l7smkpry1ldkpdkyvs9fgrqpay3w0jfk9gd"; + version = "0.9.16.4.1911"; + vsnHash = "ee6e505"; + sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd"; } else { - version = "0.9.15.6.1714"; - vsnHash = "7be11e1"; - sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g"; + version = "0.9.16.4.1911"; + vsnHash = "ee6e505"; + sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd"; }; in stdenv.mkDerivation rec { @@ -40,12 +40,12 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do - patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" + patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ - -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \; + -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; # executables need libstdc++.so.6 ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6" diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 896b41f6780d8..02f5363be8e7d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { patches = [ ./caps-fix.patch ]; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; propagatedBuildInputs = @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ json_c libsndfile speexdsp fftwFloat ] - ++ lib.optionals stdenv.isLinux [ glib dbus.libs ] + ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 @@ -110,8 +112,9 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la - ''; + sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la + '' + + ''moveToOutput lib/cmake "$dev" ''; meta = { description = "Sound server for POSIX and Win32 systems"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0f3b9bb7a6580..2368ba18a494b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -18,11 +18,11 @@ with lib; stdenv.mkDerivation rec { - name = "samba-4.3.6"; + name = "samba-4.3.8"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0929fpk2pq4v389naai519xvsm9bzpar4jlgjxwlx1cnn6jyql9j"; + sha256 = "041b5frh4ikcka922aqhqjvlv4w2s7jycyykpvsknj0a79ncd79p"; }; patches = diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 0a651762f185f..c9f4e2d253f9b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin" + substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin" ''; postInstall = '' wrapProgram $out/bin/shellinaboxd \ - --prefix LD_LIBRARY_PATH : ${openssl}/lib + --prefix LD_LIBRARY_PATH : ${openssl.out}/lib mkdir -p $out/lib cp shellinabox/* $out/lib ''; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index e26fd6ca749e3..85dfa805fc14d 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, pkgconfig , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { # Fixes support for gcrypt 1.6+ patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ @@ -60,13 +61,13 @@ stdenv.mkDerivation rec { postInstall = '' sed -i $out/lib/libshi{sa,shi}.la \ '' + optionalString (optLibidn != null) '' - -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \ + -e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \ '' + optionalString (optGnutls != null) '' - -e 's,\(-lgnutls\),-L${optGnutls}/lib \1,' \ + -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \ '' + '' - -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \ - -e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \ - -e 's,\(-ltasn1\),-L${libtasn1}/lib \1,' + -e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \ + -e 's,\(-lgpg-error\),-L${libgpgerror.out}/lib \1,' \ + -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,' ''; meta = { diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9ca1a23ea345b..c8f25b6f09dbe 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { # temporary due to https://mariadb.atlassian.net/browse/MDEV-9000 (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib - ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] + ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ] + ++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; @@ -60,13 +61,15 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB=1" - "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" + "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" ]; # fails to find lex_token.h sometimes enableParallelBuilding = false; outputs = [ "out" "lib" ]; + setOutputFlags = false; + moveToDev = false; prePatch = '' substituteInPlace cmake/libutils.cmake \ @@ -101,19 +104,10 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - # Fix library rpaths - # TODO: put this in the stdenv to prepare for wide usage of multi-output derivations - for file in $(grep -rl $out/lib $lib); do - install_name_tool -delete_rpath $out/lib -add_rpath $lib $file - done - - '' + '' # Fix the mysql_config sed -i $out/bin/mysql_config \ - -e 's,-lz,-L${zlib}/lib -lz,g' \ - -e 's,-lssl,-L${openssl}/lib -lssl,g' + -e 's,-lz,-L${zlib.out}/lib -lz,g' \ + -e 's,-lssl,-L${openssl.out}/lib -lssl,g' # Add mysql_config to libs since configure scripts use it mkdir -p $lib/bin diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index afd2222918ebd..443dafef55ca7 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -17,7 +17,7 @@ composableDerivation.composableDerivation {} { /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ }; - buildInputs = [ (pcre.override { unicodeSupport = true; }) + buildInputs = [ pcre openssl readline libxml2 ]; # optional python perl php java ? cfg = { diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bba2bf2d6825f..5fec92a5bf8af 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -10,7 +10,8 @@ let inherit sha256; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "lib" "doc" ]; + setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = [ zlib readline openssl ] @@ -20,8 +21,11 @@ let makeFlags = [ "world" ]; - configureFlags = - [ "--with-openssl" ] + configureFlags = [ + "--with-openssl" + "--sysconfdir=/etc" + "--libdir=$(lib)/lib" + ] ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; @@ -36,8 +40,12 @@ let postInstall = '' + moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it + moveToOutput "lib/*.a" "$out" + moveToOutput "lib/libecpg*" "$out" + # Prevent a retained dependency on gcc-wrapper. - substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld ''; disallowedReferences = [ stdenv.cc ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index c51aadf0d19cf..6e1e8adb8f748 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ums-${version}"; - version = "5.4.0"; + version = "6.2.2"; src = fetchurl { url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; - sha256 = "0ryp26h7pyqing8pyg0xjrp1wm77wwgya4a7d00wczh885pk16kq"; + sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15"; name = "${name}.tgz"; }; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e683c7f5f0c35..5684704205f16 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "4.8.14"; + version = "4.8.15"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "2498d898399c4ce636ea62e5e4bb1afdd6146e45d721084fe28a44bfd3dffb11"; + sha256 = "1p77l2186mw32l59inyd79rpachcs634z891k1vqcwn9gm7a39r2"; }; buildInputs = [ unzip ]; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index aabc34dce60cd..15da0b51795ba 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -10,7 +10,7 @@ postInstall() { local r p requires set +o pipefail - requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \ + requires=$(grep "Requires:" ${!outputDev}/lib/pkgconfig/*.pc | \ sed "s/Requires://" | sed "s/,/ /g") set -o pipefail @@ -33,10 +33,6 @@ postInstall() { done fi done - - mkdir -p "$out/nix-support" - echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" - echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs" } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bb9e73d31cd3d..7ba97cf35b045 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2347,6 +2347,21 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + # TODO: + # With the current state of ./generate-expr-from-tarballs.pl, + # this will get overwritten when next invoked. + # Could add a special case to ./generate-expr-from-tarballs.pl, + # or perhaps there's a cleaner solution. + #xquartz = (mkDerivation "xquartz" { + # name = "xorg-server-1.14.6"; + # builder = ./builder.sh; + # src = fetchurl { + # url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; + # sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; + # }; + # buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; + #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; + xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch b/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch new file mode 100644 index 0000000000000..fe079eeb42a75 --- /dev/null +++ b/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch @@ -0,0 +1,13 @@ +diff --git a/imake.c b/imake.c +index c20cd4a..ec2589b 100644 +--- a/imake.c ++++ b/imake.c +@@ -959,7 +959,7 @@ get_libc_version(FILE *inFile) + { + char aout[4096], *tmpdir; + FILE *fp; +- const char *format = "%s -o %s -x c -"; ++ const char *format = "f=$(mktemp imakeXXXXXX.c); cat > $f; %s $f -o %s"; + char *cc; + int len; + char *command; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b3d13c9c2589d..2743551474d86 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -48,7 +48,7 @@ in imake = attrs: attrs // { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; - patches = [./imake.patch]; + patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null; CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin then "${args.tradcpp}/bin/cpp" @@ -73,7 +73,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; - outputs = [ "out" "doc" "man" ]; + outputs = [ "dev" "out" "doc" ]; }; xcbproto = attrs : attrs // { @@ -81,6 +81,7 @@ in }; libX11 = attrs: attrs // { + outputs = [ "dev" "out" "man" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling + '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; @@ -90,7 +91,6 @@ in rm -rf $out/share/doc ''; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "out" "man" ]; }; libAppleWM = attrs: attrs // { @@ -100,7 +100,16 @@ in ''; }; + libXau = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + + libXdmcp = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + }; + libXfont = attrs: attrs // { + outputs = [ "dev" "out" ]; propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2 # prevents "misaligned_stack_error_entering_dyld_stub_binder" configureFlags = lib.optionals isDarwin [ @@ -109,14 +118,10 @@ in }; libXxf86vm = attrs: attrs // { + outputs = [ "dev" "out" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; - libXrandr = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; - propagatedBuildInputs = [xorg.libXrender]; - }; - # Propagate some build inputs because of header file dependencies. # Note: most of these are in Requires.private, so maybe builder.sh # should propagate them automatically. @@ -126,7 +131,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "out" "doc" "man" ]; + outputs = [ "dev" "out" "docdev" ]; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -139,44 +144,106 @@ in propagatedBuildInputs = [ xorg.fixesproto ]; }; + libICE = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + }; + libXcomposite = attrs: attrs // { + outputs = [ "dev" "out" ]; propagatedBuildInputs = [ xorg.libXfixes ]; }; libXaw = attrs: attrs // { + outputs = [ "dev" "out" "docdev" ]; propagatedBuildInputs = [ xorg.libXmu ]; }; + libXcursor = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + + libXdamage = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + libXft = attrs: attrs // { + outputs = [ "dev" "out" ]; propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; # the include files need ft2build.h, and Requires.private isn't enough for us postInstall = '' - sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc" + sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc" ''; }; libXext = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; - libSM = attrs: attrs - // { propagatedBuildInputs = [ xorg.libICE ]; }; + libXfixes = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + + libXi = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + }; + + libXinerama = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + + libXmu = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"''; + }; + + libXrandr = attrs: attrs // { + outputs = [ "dev" "out" ]; + preConfigure = setMalloc0ReturnsNullCrossCompiling; + propagatedBuildInputs = [xorg.libXrender]; + }; + + libSM = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + propagatedBuildInputs = [ xorg.libICE ]; + }; - libXrender = attrs: attrs - // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }; + libXrender = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + preConfigure = setMalloc0ReturnsNullCrossCompiling; + }; - libXvMC = attrs: attrs - // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; }; + libXres = attrs: attrs // { + outputs = [ "dev" "out" "docdev" ]; + }; + + libXv = attrs: attrs // { + outputs = [ "dev" "out" "docdev" ]; + }; + + libXvMC = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + buildInputs = attrs.buildInputs ++ [xorg.renderproto]; + }; libXpm = attrs: attrs // { + outputs = [ "dev" "out" "bin" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; libXpresent = attrs: attrs // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; }; + libxkbfile = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to avoid propagation + }; + + libxshmfence = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to avoid propagation + }; + setxkbmap = attrs: attrs // { postInstall = '' @@ -193,10 +260,30 @@ in buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; }; + xcbutil = attrs: attrs // { + outputs = [ "dev" "out" ]; + }; + xcbutilcursor = attrs: attrs // { meta.maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; + xcbutilimage = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + }; + + xcbutilkeysyms = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + }; + + xcbutilrenderutil = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + }; + + xcbutilwm = attrs: attrs // { + outputs = [ "dev" "out" ]; # mainly to get rid of propagating others + }; + xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; @@ -280,7 +367,7 @@ in version = (builtins.parseDrvName attrs.name).version; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ - args.zlib args.mesa args.dbus.libs + args.zlib args.mesa args.dbus xf86bigfontproto glproto xf86driproto compositeproto scrnsaverproto resourceproto xf86dgaproto @@ -307,6 +394,7 @@ in in if (!isDarwin) then { + outputs = [ "dev" "out" ]; buildInputs = [ makeWrapper ] ++ commonBuildInputs; propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev @@ -329,6 +417,12 @@ in --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others + cd "$dev" + for f in include/xorg/*.h; do + sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f" + done + ) ''; passthru.version = version; # needed by virtualbox guest additions } else { @@ -402,7 +496,7 @@ in stdenv = if isDarwin then args.clangStdenv else stdenv; buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds; configureFlags = [ - "--with-xserver=${xorg.xorgserver}/bin/X" + "--with-xserver=${xorg.xorgserver.out}/bin/X" ] ++ lib.optionals isDarwin [ "--with-bundle-id-prefix=org.nixos.xquartz" "--with-launchdaemons-dir=\${out}/LaunchDaemons" diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 920b66147f26f..db0c446617af6 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -159,7 +159,7 @@ in stdenv.mkDerivation { --replace "@ENCODINGSDIR@" "${xorg.encodings}/share/fonts/X11/encodings" \ --replace "@MKFONTDIR@" "${xorg.mkfontdir}/bin/mkfontdir" \ --replace "@MKFONTSCALE@" "${xorg.mkfontscale}/bin/mkfontscale" \ - --replace "@FC_CACHE@" "${fontconfig}/bin/fc-cache" \ + --replace "@FC_CACHE@" "${fontconfig.bin}/bin/fc-cache" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" cp ${./xinitrc} $out/etc/X11/xinit/xinitrc diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1f3f85e827601..10658ce4dd288 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -13,7 +13,7 @@ }: let - ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ]; + ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} -e diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index c9eee56b90509..815b7bde73aa1 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -9,6 +9,8 @@ let shortName = "bash43"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { @@ -21,7 +23,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - outputs = [ "out" "doc" ]; + outputs = if (!interactive) # conditional to avoid mass rebuild ATM + then [ "out" "doc" ] + else [ "out" "doc" "info" ]; + + # the man pages are small and useful enough + outputMan = if interactive then "out" else null; NIX_CFLAGS_COMPILE = '' -DSYS_BASHRC="/etc/bashrc" @@ -43,17 +50,17 @@ stdenv.mkDerivation rec { }; in import ./bash-4.3-patches.nix patch) - ++ stdenv.lib.optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; + ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { configureFlags = baseConfigureFlags + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + - stdenv.lib.optionalString stdenv.isCygwin '' + optionalString stdenv.isCygwin '' --without-libintl-prefix --without-libiconv-prefix --with-installed-readline bash_cv_dev_stdin=present bash_cv_dev_fd=standard - bash_cv_termcap_lib=libncurses + bash_cv_termcap_lib=libncurses ''; }; @@ -61,20 +68,29 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. nativeBuildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive readline - ++ stdenv.lib.optional stdenv.isDarwin binutils; + ++ optional (texinfo != null) texinfo + ++ optional interactive readline + ++ optional stdenv.isDarwin binutils; # Bash randomly fails to build because of a recursive invocation to # build `version.h'. enableParallelBuilding = false; postInstall = '' - # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" ''; - meta = { + postFixup = if interactive + then '' + substituteInPlace "$out/bin/bashbug" \ + --replace '${stdenv.shell}' "$out/bin/bash" + '' + # most space is taken by locale data + else '' + rm -r "$out/share" "$out/bin/bashbug" + ''; + + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/bash/; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + @@ -91,11 +107,11 @@ stdenv.mkDerivation rec { Bash without modification. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ maintainers.simons ]; }; passthru = { diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 521212940672b..6b4a91e90142d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { -i "$out/share/fish/functions/alias.fish" \ "$out/share/fish/functions/prompt_pwd.fish" substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ - --replace "clear;" "${ncurses}/bin/clear;" + --replace "clear;" "${ncurses.out}/bin/clear;" '' + stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \ --replace "| ul" "| ${utillinux}/bin/ul" @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { '' + '' sed -i "s|/sbin /usr/sbin||" \ "$out/share/fish/functions/__fish_complete_subcommand_root.fish" + + # make fish pick up completions from nix profile + echo "set fish_complete_path (echo \$NIX_PROFILES | tr ' ' '\n')\"/share/fish/vendor_completions.d\" \$fish_complete_path" >> $out/share/fish/config.fish ''; meta = with stdenv.lib; { diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix index cff6fd0a3eed1..da468d56a2cda 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/common-path.nix @@ -7,9 +7,9 @@ pkgs.gawk pkgs.gnutar pkgs.gzip - pkgs.bzip2 + pkgs.bzip2.bin pkgs.gnumake pkgs.bash pkgs.patch - pkgs.xz + pkgs.xz.bin ] diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 52f8f007b001f..09d9ed23b3f84 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -178,7 +178,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ xz libcxx libcxxabi icu ]) ++ + (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ (with pkgs.darwin; [ dyld Libsystem CF locale ]); overrides = persistent1; @@ -214,7 +214,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ - (with pkgs; [ icu bash libcxx libcxxabi ]) ++ + (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ (with pkgs.darwin; [ dyld Libsystem locale ]); overrides = persistent2; @@ -297,9 +297,11 @@ in rec { }; allowedRequisites = (with pkgs; [ - xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi - coreutils ed diffutils gnutar gzip ncurses gnused bash gawk - gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext + xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out + bzip2.bin llvmPackages.llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar + gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk + gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out + binutils-raw.dev binutils gettext ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools libiconv locale ]); diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index b0025351b0494..561dcc7fdfda1 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -30,9 +30,9 @@ rec { cp -rL ${darwin.Libsystem}/include $out chmod -R u+w $out/include - cp -rL ${icu}/include* $out/include + cp -rL ${icu.dev}/include* $out/include cp -rL ${libiconv}/include/* $out/include - cp -rL ${gnugrep.pcre}/include/* $out/include + cp -rL ${gnugrep.pcre.dev}/include/* $out/include mv $out/include $out/include-Libsystem # Copy coreutils, bash, etc. @@ -49,23 +49,23 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin - cp -d ${xz}/bin/xz $out/bin + cp -d ${xz.bin}/bin/xz $out/bin # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static - cp ${curl}/bin/curl $out/bin - cp -d ${curl}/lib/libcurl*.dylib $out/lib - cp -d ${libssh2}/lib/libssh*.dylib $out/lib - cp -d ${openssl}/lib/*.dylib $out/lib + cp ${curl.bin}/bin/curl $out/bin + cp -d ${curl.out}/lib/libcurl*.dylib $out/lib + cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib + cp -d ${openssl.out}/lib/*.dylib $out/lib - cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib - cp -d ${libiconv}/lib/lib*.dylib $out/lib + cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib + cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib cp -d ${gettext}/lib/libintl*.dylib $out/lib chmod +x $out/lib/libintl*.dylib - cp -d ${ncurses}/lib/libncurses*.dylib $out/lib + cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib # Copy what we need of clang cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin @@ -80,10 +80,10 @@ rec { mkdir $out/include cp -rd ${libcxx}/include/c++ $out/include - cp -d ${icu}/lib/libicu*.dylib $out/lib - cp -d ${zlib}/lib/libz.* $out/lib - cp -d ${gmpxx}/lib/libgmp*.* $out/lib - cp -d ${xz}/lib/liblzma*.* $out/lib + cp -d ${icu.out}/lib/libicu*.dylib $out/lib + cp -d ${zlib.out}/lib/libz.* $out/lib + cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib + cp -d ${xz.out}/lib/liblzma*.* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do @@ -138,7 +138,7 @@ rec { cp ${stdenv.shell} $out/on-server/sh cp ${cpio}/bin/cpio $out/on-server cp ${coreutils_}/bin/mkdir $out/on-server - cp ${bzip2}/bin/bzip2 $out/on-server + cp ${bzip2.bin}/bin/bzip2 $out/on-server chmod u+w $out/on-server/* strip $out/on-server/* diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6dc2553db3860..547541d28246e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -82,6 +82,7 @@ let ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh + ../../build-support/setup-hooks/multiple-outputs.sh ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-lib64.sh ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh @@ -219,12 +220,25 @@ let # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we - # include it in the result, it *is* available to nix-env for - # queries. We also a meta.position attribute here to - # identify the source location of the package. - meta = meta // (if pos' != null then { - position = pos'.file + ":" + toString pos'.line; - } else {}); + # include it in the result, it *is* available to nix-env for queries. + meta = { } + # If the packager hasn't specified `outputsToInstall`, choose a default, + # namely `p.bin or p.out or p`; + # if he has specified it, it will be overridden below in `// meta`. + # Note: This default probably shouldn't be globally configurable. + # Services and users should specify outputs explicitly, + # unless they are comfortable with this default. + // { outputsToInstall = + let + outs = outputs'; # the value passed to derivation primitive + hasOutput = out: builtins.elem out outs; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; + } + // meta + # Fill `meta.position` to identify the source location of the package. + // lib.optionalAttrs (pos' != null) + { position = pos'.file + ":" + toString pos'.line; } + ; inherit passthru; } // # Pass through extra attributes that are not inputs, but diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index cca4648d2375c..9399ff7a76437 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -174,12 +174,21 @@ ensureDir() { } -installBin() { - mkdir -p $out/bin - cp "$@" $out/bin +# Add $1/lib* into rpaths. +# The function is used in multiple-outputs.sh hook, +# so it is defined here but tried after the hook. +_addRpathPrefix() { + if [ "$NIX_NO_SELF_RPATH" != 1 ]; then + export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS" + if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then + export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS" + fi + if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then + export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS" + fi + fi } - # Return success if the specified file is an ELF object. isELF() { local fn="$1" @@ -312,16 +321,7 @@ for i in $crossPkgs; do done -# Add the output as an rpath. -if [ "$NIX_NO_SELF_RPATH" != 1 ]; then - export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" - if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then - export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" - fi - if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then - export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS" - fi -fi +_addRpathPrefix "$out" # Set the TZ (timezone) environment variable, otherwise commands like @@ -643,7 +643,7 @@ configurePhase() { done fi - if [ -z "$dontAddPrefix" ]; then + if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi @@ -708,7 +708,9 @@ checkPhase() { installPhase() { runHook preInstall - mkdir -p "$prefix" + if [ -n "$prefix" ]; then + mkdir -p "$prefix" + fi installTargets=${installTargets:-install} echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" @@ -737,24 +739,29 @@ fixupPhase() { prefix=${!output} runHook fixupOutput done + + # Propagate build inputs and setup hook into the development output. + if [ -n "$propagatedBuildInputs" ]; then - mkdir -p "$out/nix-support" - echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" + mkdir -p "${!outputDev}/nix-support" + echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs" fi if [ -n "$propagatedNativeBuildInputs" ]; then - mkdir -p "$out/nix-support" - echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs" + mkdir -p "${!outputDev}/nix-support" + echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" fi - if [ -n "$propagatedUserEnvPkgs" ]; then - mkdir -p "$out/nix-support" - echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages" + if [ -n "$setupHook" ]; then + mkdir -p "${!outputDev}/nix-support" + substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook" fi - if [ -n "$setupHook" ]; then - mkdir -p "$out/nix-support" - substituteAll "$setupHook" "$out/nix-support/setup-hook" + # Propagate user-env packages into the output with binaries, TODO? + + if [ -n "$propagatedUserEnvPkgs" ]; then + mkdir -p "${!outputBin}/nix-support" + echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap/i686.nix index e02bb1e83d34c..cf484fd925330 100644 --- a/pkgs/stdenv/linux/bootstrap/i686.nix +++ b/pkgs/stdenv/linux/bootstrap/i686.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/busybox; - sha256 = "9278001d11bb0359d0cc1b30bd5c9823f0b9c65db127d6dfcc1f6bbc000d15a0"; + url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox; + sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz; - sha256 = "6bc27ce9b08adcca0298f5fe80fe67f5bbb2dffdd1d8666fd44cb76ace198a25"; + url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz; + sha256 = "cf920d26d94335f5cb46e247455d0e5389765d16a2b8fc233b792a655b5b58aa"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap/x86_64.nix index df803dae032bc..69d08c5e981ad 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64.nix @@ -3,7 +3,7 @@ { bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/x86_64/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz; - sha256 = "325230b74d3d98f62ddcb595543887d09cd8421745a4eda229d2a87a1f1ed336"; + url = http://tarballs.nixos.org/stdenv-linux/x86_64/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz; + sha256 = "abe3f0727dd771a60b7922892d308da1bc7b082afc13440880862f0c8823c09f"; }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index f0b6ce7c9f3d6..fbadfa80fe152 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -287,11 +287,13 @@ rec { shellPackage = stage4.pkgs.bash; }; + /* outputs TODO allowedRequisites = with stage4.pkgs; [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv ]; + */ overrides = pkgs: { gcc = cc; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 3adb00693f758..d6e024c625839 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -130,20 +130,20 @@ rec { mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. - cp -d ${glibc}/lib/ld-*.so* $out/lib - cp -d ${glibc}/lib/libc*.so* $out/lib - cp -d ${glibc}/lib/libc_nonshared.a $out/lib - cp -d ${glibc}/lib/libm*.so* $out/lib - cp -d ${glibc}/lib/libdl*.so* $out/lib - cp -d ${glibc}/lib/librt*.so* $out/lib - cp -d ${glibc}/lib/libpthread*.so* $out/lib - cp -d ${glibc}/lib/libnsl*.so* $out/lib - cp -d ${glibc}/lib/libutil*.so* $out/lib - cp -d ${glibc}/lib/libnss*.so* $out/lib - cp -d ${glibc}/lib/libresolv*.so* $out/lib - cp -d ${glibc}/lib/crt?.o $out/lib + cp -d ${glibc.out}/lib/ld-*.so* $out/lib + cp -d ${glibc.out}/lib/libc*.so* $out/lib + cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib + cp -d ${glibc.out}/lib/libm*.so* $out/lib + cp -d ${glibc.out}/lib/libdl*.so* $out/lib + cp -d ${glibc.out}/lib/librt*.so* $out/lib + cp -d ${glibc.out}/lib/libpthread*.so* $out/lib + cp -d ${glibc.out}/lib/libnsl*.so* $out/lib + cp -d ${glibc.out}/lib/libutil*.so* $out/lib + cp -d ${glibc.out}/lib/libnss*.so* $out/lib + cp -d ${glibc.out}/lib/libresolv*.so* $out/lib + cp -d ${glibc.out}/lib/crt?.o $out/lib - cp -rL ${glibc}/include $out + cp -rL ${glibc.dev}/include $out chmod -R u+w $out/include # Hopefully we won't need these. @@ -166,7 +166,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin @@ -199,9 +199,9 @@ rec { rm -rf $out/include/c++/*/ext/parallel cp -d ${gmpxx}/lib/libgmp*.so* $out/lib - cp -d ${mpfr}/lib/libmpfr*.so* $out/lib + cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib cp -d ${libmpc}/lib/libmpc*.so* $out/lib - cp -d ${zlib}/lib/libz.so* $out/lib + cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib # TBD: Why are these needed for cross but not native tools? @@ -213,7 +213,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 68456942d40f7..8ffeebaa962e6 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -10,6 +10,8 @@ rec { aclSupport = false; }); + tarMinimal = gnutar.override { acl = null; }; + busyboxMinimal = busybox.override { useMusl = true; enableStatic = true; @@ -37,28 +39,28 @@ rec { mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. - cp -d ${glibc}/lib/ld*.so* $out/lib - cp -d ${glibc}/lib/libc*.so* $out/lib - cp -d ${glibc}/lib/libc_nonshared.a $out/lib - cp -d ${glibc}/lib/libm*.so* $out/lib - cp -d ${glibc}/lib/libdl*.so* $out/lib - cp -d ${glibc}/lib/librt*.so* $out/lib - cp -d ${glibc}/lib/libpthread*.so* $out/lib - cp -d ${glibc}/lib/libnsl*.so* $out/lib - cp -d ${glibc}/lib/libutil*.so* $out/lib - cp -d ${glibc}/lib/libnss*.so* $out/lib - cp -d ${glibc}/lib/libresolv*.so* $out/lib - cp -d ${glibc}/lib/crt?.o $out/lib - - cp -rL ${glibc}/include $out + cp -d ${glibc.out}/lib/ld*.so* $out/lib + cp -d ${glibc.out}/lib/libc*.so* $out/lib + cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib + cp -d ${glibc.out}/lib/libm*.so* $out/lib + cp -d ${glibc.out}/lib/libdl*.so* $out/lib + cp -d ${glibc.out}/lib/librt*.so* $out/lib + cp -d ${glibc.out}/lib/libpthread*.so* $out/lib + cp -d ${glibc.out}/lib/libnsl*.so* $out/lib + cp -d ${glibc.out}/lib/libutil*.so* $out/lib + cp -d ${glibc.out}/lib/libnss*.so* $out/lib + cp -d ${glibc.out}/lib/libresolv*.so* $out/lib + cp -d ${glibc.out}/lib/crt?.o $out/lib + + cp -rL ${glibc.dev}/include $out chmod -R u+w "$out" # glibc can contain linker scripts: find them, copy their deps, # and get rid of absolute paths (nuke-refs would make them useless) local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") - cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc}' | sort -u) + cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u) for f in $lScripts; do - substituteInPlace "$f" --replace '${glibc}/lib/' "" + substituteInPlace "$f" --replace '${glibc.out}/lib/' "" done # Hopefully we won't need these. @@ -68,33 +70,33 @@ rec { mv $out/include $out/include-glibc # Copy coreutils, bash, etc. - cp ${coreutilsMinimal}/bin/* $out/bin + cp ${coreutilsMinimal.out}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - cp ${bash}/bin/bash $out/bin - cp ${findutils}/bin/find $out/bin - cp ${findutils}/bin/xargs $out/bin - cp -d ${diffutils}/bin/* $out/bin - cp -d ${gnused}/bin/* $out/bin - cp -d ${gnugrep}/bin/grep $out/bin - cp ${gawk}/bin/gawk $out/bin - cp -d ${gawk}/bin/awk $out/bin - cp ${gnutar}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin - cp -d ${gnumake}/bin/* $out/bin + cp ${bash.out}/bin/bash $out/bin + cp ${findutils.out}/bin/find $out/bin + cp ${findutils.out}/bin/xargs $out/bin + cp -d ${diffutils.out}/bin/* $out/bin + cp -d ${gnused.out}/bin/* $out/bin + cp -d ${gnugrep.out}/bin/grep $out/bin + cp ${gawk.out}/bin/gawk $out/bin + cp -d ${gawk.out}/bin/awk $out/bin + cp ${tarMinimal.out}/bin/tar $out/bin + cp ${gzip.out}/bin/gzip $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin + cp -d ${gnumake.out}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep + cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. - cp -d ${gcc.cc}/bin/gcc $out/bin - cp -d ${gcc.cc}/bin/cpp $out/bin - cp -d ${gcc.cc}/bin/g++ $out/bin - cp -d ${gcc.cc}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.cc}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc.cc}/lib/gcc $out/lib + cp -d ${gcc.cc.out}/bin/gcc $out/bin + cp -d ${gcc.cc.out}/bin/cpp $out/bin + cp -d ${gcc.cc.out}/bin/g++ $out/bin + cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib + cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib + cp -rd ${gcc.cc.out}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/sound @@ -102,26 +104,26 @@ rec { rm -f $out/lib/gcc/*/*/include-fixed/asm rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc.cc}/libexec/* $out/libexec + cp -rd ${gcc.cc.out}/libexec/* $out/libexec chmod -R u+w $out/libexec rm -rf $out/libexec/gcc/*/*/plugin mkdir $out/include - cp -rd ${gcc.cc}/include/c++ $out/include + cp -rd ${gcc.cc.out}/include/c++ $out/include chmod -R u+w $out/include rm -rf $out/include/c++/*/ext/pb_ds rm -rf $out/include/c++/*/ext/parallel - cp -d ${gmpxx}/lib/libgmp*.so* $out/lib - cp -d ${mpfr}/lib/libmpfr*.so* $out/lib + cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib + cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib cp -d ${libmpc}/lib/libmpc*.so* $out/lib - cp -d ${zlib}/lib/libz.so* $out/lib + cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do - cp ${binutils}/bin/$i $out/bin + cp ${binutils.out}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix index 91042fe059115..13b6b01f32599 100644 --- a/pkgs/test/openftd/default.nix +++ b/pkgs/test/openftd/default.nix @@ -45,5 +45,5 @@ stdenv.mkDerivation { glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml ]; - configureFlags="--with-libcurl-libraries=${curl}/lib --with-libcurl-headers=${curl}/include --with-pcre_libraries=${pcre}/lib --with-pcre_headers=${pcre}/include"; + configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include"; } diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 2206905aa3e44..d1f2318d6d45a 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -43,7 +43,7 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; - bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ]; + bbdPath = lib.makeBinPath [ module_init_tools xorgserver ]; bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 06dfd28b7399c..ccf998951a341 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -45,7 +45,7 @@ EOF else RESET_OPTION=\"-noreset\" fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver.out}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" echo \"\$PRE_XCMD\" echo \"\$PRE_XCMD\" | bash diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b0c79342d42a6..ae869cfb1c4f6 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -48,7 +48,7 @@ buildPythonApplication rec { --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; preCheck = "exit 0"; @@ -57,7 +57,7 @@ buildPythonApplication rec { #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 7fd24a510d5db..f30c0751c3f26 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -54,7 +54,7 @@ buildPythonApplication rec { --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; preCheck = "exit 0"; @@ -64,7 +64,7 @@ buildPythonApplication rec { #postFixup = '' # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix new file mode 100644 index 0000000000000..08f21dc626223 --- /dev/null +++ b/pkgs/tools/admin/daemontools/default.nix @@ -0,0 +1,42 @@ +{ fetchurl, bash, glibc, stdenv }: + +stdenv.mkDerivation rec { + name = "daemontools-0.76"; + + src = fetchurl { + url = "https://cr.yp.to/daemontools/${name}.tar.gz"; + sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; + }; + + configurePhase = '' + cd ${name} + + sed -ie '1 s_$_ -include ${glibc}/include/errno.h_' src/conf-cc + + substituteInPlace src/Makefile \ + --replace '/bin/sh' '${bash}/bin/bash -oxtrace' + + sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests + + cat ${glibc}/include/errno.h + ''; + + buildPhase = '' + package/compile + ''; + + installPhase = '' + for cmd in $(cat package/commands); do + install -Dm755 "command/$cmd" "$out/bin/$cmd" + done + ''; + + meta = { + license = stdenv.lib.licenses.publicDomain; + homepage = https://cr.yp.to/daemontools.html; + description = "A collection of tools for managing UNIX services."; + + maintainers = with stdenv.lib.maintainers; [ kevincox ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index fddb9505c9841..657d08026e4a8 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # Fix broken .la files preFixup = '' - sed 's,-lgpg-error,-L${libgpgerror}/lib -lgpg-error,' -i $out/lib/*.la + sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index d6156ab490998..cac1b9b3c92ca 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, xorg , autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config , fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext -, cmake, libjpeg_turbo, fltk +, cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1 }: with stdenv.lib; @@ -69,12 +69,12 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXext gettext xorg.libICE xorg.libXtst xorg.libXi xorg.libSM xorg.libXft nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xorg.xineramaproto - xorg.libXinerama xorg.libXcursor + xorg.libXinerama xorg.libXcursor nettle libiconv libtasn1 ]; nativeBuildInputs = [ autoconf automake cvs xorg.utilmacros xorg.fontutil libtool flex bison - cmake + cmake gettext ] ++ xorg.xorgserver.nativeBuildInputs; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { # Prevent a store collision. priority = 4; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 71b43bf2de9ae..36d3ebd9816fb 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, autoreconfHook, acl }: stdenv.mkDerivation rec { name = "gnutar-${version}"; @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { substituteInPlace src/system.c --replace '_(' 'N_(' ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + outputs = [ "out" "info" ]; + + buildInputs = [ ] + ++ stdenv.lib.optional stdenv.isLinux acl + ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 6769540d8dfb1..a0f3bcb0ebb9c 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "9.38"; + version = "15.14.1"; in stdenv.mkDerivation rec { name = "p7zip-${version}"; src = fetchurl { url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2"; - sha256 = "0mxribb9a3lz3bifz6002hg7vyy8h9piinypian533hw8qvswfx7"; + sha256 = "1m15iwglyjpiw82m7dbpykz8s55imch34w20w09l34116vdb97b9"; }; preConfigure = '' diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 768c7afd7eb74..f2fdc71dc86cb 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - installBin unrar + install -Dt "$out/bin" unrar mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index 251a62ee48940..fae72e5fcd842 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,15 +1,31 @@ -{stdenv, fetchsvn, zlib, autoconf, automake, libtool}: - -stdenv.mkDerivation { - name = "unshield-0.7pre3955"; - src = fetchsvn { - url = https://synce.svn.sourceforge.net/svnroot/synce/trunk/unshield; - rev = 3955; - sha256 = "0rpk7sb7b0v19qn4jn0iih505l4zkpns3mrbmm88p61xiz06zg7a"; +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, openssl }: + +stdenv.mkDerivation rec { + name = "unshield-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "twogood"; + repo = "unshield"; + rev = version; + sha256 = "0cg84jr0ymvi8bmm3lx5hshhgm33vnr1rma1mfyqkc065c7gi9ja"; + }; + + patches = [ + # Fix build in separate directory + (fetchpatch { + url = "https://github.com/twogood/unshield/commit/07ce8d82f0f60b9048265410fa8063298ab520c4.patch"; + sha256 = "160pbk2r98lv3vd0qxsxm6647qn5mddj37jzfmccdja4dpxhxz2z"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib openssl ]; + + meta = with stdenv.lib; { + description = "Tool and library to extract CAB files from InstallShield installers"; + homepage = https://github.com/twogood/unshield; + license = licenses.mit; + platforms = platforms.linux; }; - configureFlags = "--with-zlib=${zlib}"; - buildInputs = [autoconf automake libtool]; - preConfigure = '' - ./bootstrap - ''; } diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index ed0cd80863419..ba0a174ed0a81 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="708"; + version="711"; name="${baseName}-${version}"; - hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6"; - url="http://mattmahoney.net/dc/zpaq708.zip"; - sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6"; + hash="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf"; + url="http://mattmahoney.net/dc/zpaq711.zip"; + sha256="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf"; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 6a7891d2ebe18..3268135b57b6e 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaqd"; - version="633"; + version="707"; name="${baseName}-${version}"; - hash="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx"; - url="http://mattmahoney.net/dc/zpaqd633.zip"; - sha256="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx"; + hash="0012jzs2gk232shgx60323jd3g1i5ab5sjydynz2d1k3dkjxs688"; + url="http://mattmahoney.net/dc/zpaqd707.zip"; + sha256="0012jzs2gk232shgx60323jd3g1i5ab5sjydynz2d1k3dkjxs688"; }; isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isx86 = stdenv.isi686 || stdenv.isx86_64; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 4532d6424116e..0079270e29faa 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -128,7 +128,7 @@ in buildPythonApplication rec { }' beets/ui/commands.py '' + optionalString enableBadfiles '' sed -i -e '/self\.run_command(\[/ { - s,"flac","${flac}/bin/flac", + s,"flac","${flac.bin}/bin/flac", s,"mp3val","${mp3val}/bin/mp3val", }' beetsplug/badfiles.py '' + optionalString enableReplaygain '' diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 920f6913d090b..3743b38a2103b 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_INSALL_PREFIX=$out" - "-DALSA_INCLUDE=${alsaLib}/include/alsa/version.h" + "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index b46ea186dee3a..ada4ef29c84e5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.0"; + version = "1.0.2"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz"; - sha256 = "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh"; + sha256 = "1myz10pwxnac9z59gw1w3xjhz6ghx03vngpl97ca527pj0r39shi"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 18e8bb400253d..37d99a115f8b4 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { name = "no-SSLv2.patch"; url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk" + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e"; - sha256 = "1zfixa6g1nb1hqfzn2wvyvxsr38gm7908zfml2iaqnwy6iz6jd8v"; + sha256 = "17dfqwvwnkinz8vs0l3bjjbmfx3a7y8nv3wn67gjsqpmggcpdnd6"; }) ]; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 93a7f9e1e39f7..9329cd23e83f8 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \ - --prefix PATH ":" "${which}/bin:${bzip2}/bin" + --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin" done patchShebangs $out diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 53e854c34ebc6..15167ee57b134 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = '' addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig - export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; meta = { diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index f900a81caa0e8..a3486569b5180 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; - buildInputs = [ glib dbus.libs openobex bluez libical ]; + buildInputs = [ glib dbus openobex bluez libical ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 5d4ed2414c793..1a14aae626363 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { BB_MP3DEC=${mpg123}/bin/mpg123 \ BB_OGGENC=${vorbis-tools}/bin/oggenc \ BB_OGGDEC=${vorbis-tools}/bin/oggdec \ - BB_FLACCMD=${flac}/bin/flac \ + BB_FLACCMD=${flac.bin}/bin/flac \ BB_EJECT=${utillinux}/bin/eject \ BB_NORMCMD=${normalize}/bin/normalize \ ; do diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 3185242f5ce4d..91a5440df3ec8 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -5,7 +5,7 @@ let major = "3.12"; minor = "0"; - binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; + binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 66ff5612dd4aa..a165ab2b157bb 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -41,6 +41,8 @@ in stdenv.mkDerivation { postInstall = ""; }; + outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out"; + preBuild = stdenv.lib.optionalString sharedLibrary '' make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"} ''; @@ -61,12 +63,15 @@ in stdenv.mkDerivation { ) ''); - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(bin)" ]; postInstall = '' - rm $out/bin/bunzip2* $out/bin/bzcat* - ln -s bzip2 $out/bin/bunzip2 - ln -s bzip2 $out/bin/bzcat + rm $bin/bin/bunzip2* $bin/bin/bzcat* + ln -s bzip2 $bin/bin/bunzip2 + ln -s bzip2 $bin/bin/bzcat + + mkdir "$static" + mv "$bin/lib" "$static/" ''; postPatch = '' diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 6772e21cb0cb5..009246b69a088 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-1.6"; @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp"; }; + outputs = [ "out" "man" "info" ]; + enableParallelBuilding = true; + buildInputs = [ xz.bin ]; + preConfigure = if stdenv.isCygwin then '' sed -i lib/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index f768189040b5b..6fcff7b292802 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp kzip zipmix $out/bin - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/kzip - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/zipmix + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; meta = { diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 352b4db6a3416..fb3da5e48d68f 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, bzip2 }: let major = "1.1"; - version = "${major}.12"; + version = "${major}.13"; in stdenv.mkDerivation rec { name = "pbzip2-${version}"; src = fetchurl { url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz"; - sha256 = "1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"; + sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; }; buildInputs = [ bzip2 ]; diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 07c3e205a982e..f6424b5e88037 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ -DPXZ_BUILD_DATE=\"nixpkgs\" \ - -DXZ_BINARY=\"${xz}/bin/xz\" \ + -DXZ_BINARY=\"${xz.bin}/bin/xz\" \ -DPXZ_VERSION=\"${version}\" ''; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 986f940b9069f..64571e24d9a30 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; }; + outputs = [ "dev" "out" "bin" "man" "doc" ]; + doCheck = true; # In stdenv-linux, prevent a dependency on bootstrap-tools. diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 0d5ad10efcf93..45c91d46a2e8f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { - sha256 = "18mfrq5fqd7gkkqrgc32rlb98vw45rq1vsbrg44bprg3mv6ca3ls"; + sha256 = "1r1l4pak289bjnkak2yrw65yhxfvqcmdsh10c1k0hi0wm7k3qcbw"; rev = "v${version}"; repo = "zstd"; owner = "Cyan4973"; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a53e93960aef4..c091158bff635 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - buildInputs = [ pkgconfig libuuid ]; + outputs = [ "bin" "out" "man" ]; + outputDev = "bin"; # just for *.pc + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libuuid ]; crossAttrs = { preConfigure = '' @@ -16,14 +20,19 @@ stdenv.mkDerivation rec { ''; }; - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; - - enableParallelBuilding = true; + configureFlags = [ + "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" + # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). + "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck" + ]; - preInstall = "installFlagsArray=('LN=ln -s')"; + # hacky way to make it install *.pc + postInstall = '' + make install-libs + rm "$out"/lib/*.a + ''; - postInstall = "make install-libs"; + enableParallelBuilding = true; meta = { homepage = http://e2fsprogs.sourceforge.net/; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 7fd56e7dd7f88..94bfb5fb49883 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.7.8"; + version="3.7.10"; name="${baseName}-${version}"; - hash="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.8/glusterfs-3.7.8.tar.gz"; - sha256="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709"; + hash="0shqvhqlmiywrr3vy8yazc8xcj6b04ci2zjgyca2vy7wa60lzfgg"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.10/glusterfs-3.7.10.tar.gz"; + sha256="0shqvhqlmiywrr3vy8yazc8xcj6b04ci2zjgyca2vy7wa60lzfgg"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index d3b3b716ffa08..7a8501b7a891b 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux -, useNixUdev ? true, udev ? null +, useNixUdev ? true, libudev ? null }: -assert useNixUdev -> udev != null; +assert useNixUdev -> libudev != null; buildPythonApplication rec { name = "blivet-${version}"; @@ -21,21 +21,21 @@ buildPythonApplication rec { sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { - s|wipefs|${utillinux}/sbin/wipefs| + s|wipefs|${utillinux.bin}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" + c libudev = "${libudev.out}/lib/libudev.so.1" }' blivet/pyudev.py ''; propagatedBuildInputs = [ pykickstart pyparted pyblock libselinux cryptsetup - ] ++ stdenv.lib.optional useNixUdev udev; + ] ++ stdenv.lib.optional useNixUdev libudev; # tests are currently _heavily_ broken upstream doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 1d98381689529..bdf0a5c4323d5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -12,7 +12,7 @@ let inherit stdenv fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup multipath_tools; inherit useNixUdev; - inherit (pkgs) lsof utillinux udev; + inherit (pkgs) lsof utillinux libudev; libselinux = pkgs.libselinux.override { enablePython = true; }; }; @@ -29,12 +29,12 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) pkgconfig utillinux udev coreutils; + inherit (pkgs) pkgconfig utillinux libudev systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { inherit stdenv fetchurl lvm2; - inherit (pkgs) readline udev libaio gzip; + inherit (pkgs) readline systemd libaio gzip; }; parted = import ./parted.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 9e2b0c9007947..b92c40ba99e62 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: +{ stdenv, fetchurl, pkgconfig, libudev, systemd, utillinux, coreutils }: let v = "2.02.106"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; - buildInputs = [ pkgconfig udev ]; + buildInputs = [ pkgconfig libudev ]; preConfigure = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation { --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/sbin/lvm $out/sbin/lvm \ - --replace /usr/bin/udevadm ${udev}/bin/udevadm + --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ - --replace $out/sbin/blkid ${utillinux}/sbin/blkid + --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 90722d74ace15..b78605504bf88 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }: +{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id ''; meta = { diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index fba066d0f4cb4..3337141821770 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation { # why is this required? preConfigure='' - export LD_LIBRARY_PATH=${subversion}/lib + export LD_LIBRARY_PATH=${subversion.out}/lib ''; - NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1"; + NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1"; NIX_LDFLAGS="-lsvn_client-1"; meta = { diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index de61809a1aea9..e30f67af3e951 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libuuid readline ]; - outputs = [ "out" "lib" ]; + outputs = [ "dev" "out" "bin" ]; # TODO: review xfs preConfigure = '' NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { "XGETTEXT=xgettext" "--disable-lib64" "--enable-readline" - "--includedir=$(lib)/include" - "--libdir=$(lib)/lib" ]; installFlags = [ "install-dev" ]; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 8f090c2978135..556cb674212d9 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/usr/local" "${valgrind}" substituteInPlace cpp/CMakeLists.txt \ - --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"' + --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${fuse}/lib"' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include" export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib" diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index f32f180f1d6e0..966b3df8b175e 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ${patchelf}/bin/patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${zlib}/lib:${p.gcclib}" \ + --set-rpath "${zlib.out}/lib:${p.gcclib}" \ $out/bin/yandex-disk ''; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index db7fad78a49ce..1c5c4983c8012 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -10,11 +10,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.36"; + version="2.37"; name="${baseName}-${version}"; - hash="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd"; - url="mirror://sourceforge/project/asymptote/2.36/asymptote-2.36.src.tgz"; - sha256="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd"; + hash="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i"; + url="mirror://sourceforge/project/asymptote/2.37/asymptote-2.37.src.tgz"; + sha256="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i"; }; buildInputs = [ freeglut ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 6b8de80ee70e8..4b263b555d211 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ - --set PATH "${stdenv.lib.makeSearchPath "bin" + --set PATH "${stdenv.lib.makeBinPath [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" ''; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8a9df4982a3e5..2b78f1fba4056 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ - --prefix PATH : '${fontconfig}/bin' \ + --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 6f236509a310b..9e0eea516d318 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" + "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--with-expatlibdir=${expat.out}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index ede6624ac59de..b40672754bcfe 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; + CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" + "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" "--with-sparse=no" ] diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 82f958321bdd4..9b49cca8d7b3b 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -23,22 +23,15 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + ] ++ stdenv.lib.optionals (xorg != null) + (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; - configureFlags = - [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" - "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" - "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" - ] - ++ stdenv.lib.optional (xorg == null) "--without-x"; + configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \ diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 777139d47feef..4eb464530556c 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeSearchPath "bin" [ curl gnugrep libnotify scrot which xclip ]; +let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.7.1"; name = "imgur-screenshot-${version}"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "1ff88mvrd0b7nmrkjljs3rnprk5ih0iif92dn39s3vnag3fp9f10"; + sha256 = "01wiqrc7xxvk7kzgw756jahwa0szb200l8030iwfcgxb679k3v0j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,4 +26,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ lw ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/imgurbash/default.nix b/pkgs/tools/graphics/imgurbash/default.nix deleted file mode 100644 index 66f85af879359..0000000000000 --- a/pkgs/tools/graphics/imgurbash/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, bash, curl, xsel }: - -stdenv.mkDerivation { - name = "imgurbash-4"; - - src = fetchurl { - url = "https://imgur.com/tools/imgurbash.sh"; - sha256 = "16m7dn5vqzx1q4pzssnwiwajfzrbhrz0niyhf5abxi1lwr3h0ca1"; - }; - - buildCommand = '' - mkdir -p $out/bin - cat <<EOF >$out/bin/imgurbash - #!${bash}/bin/bash - PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH - EOF - cat $src >>$out/bin/imgurbash - chmod +x $out/bin/imgurbash - ''; - - meta = with stdenv.lib; { - description = "A simple bash script to upload an image to imgur from the commandline"; - license = licenses.publicDomain; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix new file mode 100644 index 0000000000000..99ef87ca5dfec --- /dev/null +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, bash, curl, xsel }: + +stdenv.mkDerivation rec { + name = "imgurbash2-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "ram-on"; + repo = "imgurbash2"; + rev = version; + sha256 = "0w8xfdvv6h0cqln9a2b1rskpyv4v5qsywqzg10smg05xlrh9f5nx"; + }; + + installPhase = '' + mkdir -p $out/bin + cat <<EOF >$out/bin/imgurbash2 + #!${bash}/bin/bash + PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH + EOF + cat imgurbash2 >> $out/bin/imgurbash2 + chmod +x $out/bin/imgurbash2 + ''; + + meta = with stdenv.lib; { + description = "A shell script that uploads images to imgur"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + homepage = https://github.com/ram-on/imgurbash2; + }; +} diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index dfbd7c4e5e066..2fb1c9325c03f 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace jhead.c \ --replace "\" Compiled: \"__DATE__" "" \ - --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim" + --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" ''; installPhase = '' diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index c31d0b32ea098..a3a5e30d41b53 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp config.mk.in config.mk echo "STATICLIB_TOO = n" >> config.mk substituteInPlace "config.mk" \ - --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ + --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" ''; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 08f99469d255b..767ea0e542540 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.5"; + name = "optipng-0.7.6"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; + sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 69ab7f27e3434..a4184fd9514b3 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $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 + --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 496b1d3557296..b8d020ca43439 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib}/lib"; + makeFlags = "ZPATH=${zlib.out}/lib"; buildInputs = [ zlib ]; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 6a6f3e7b13c68..3bcbc5d5eade2 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.92"; + name = "pngcrush-1.8.1"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4"; + sha256 = "1h3sibmmiq4ynvf8hrpksfrbcmszxh4bqpkqy5c0m8828c7drpr9"; }; makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 471823ed9235b..afc1a2519fe10 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation { cp ${folder}/pngout $out/bin ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/pngout + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/pngout + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/pngout '' else ""} ''; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index d84989d4372b3..6da565b292f94 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchgit { inherit (s) url sha256 rev; }; - NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL"; + NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL"; configurePhase = '' sed -e 's/-[og] root//g' -i Makefile ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix new file mode 100644 index 0000000000000..1cb849fa09b18 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, intltool, pkgconfig, sqlite, libpinyin, db +, ibus, glib, gtk3, python3, pygobject3 +}: + +stdenv.mkDerivation rec { + name = "ibus-libpinyin-${version}"; + version = "1.7.4"; + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "IBus interface to the libpinyin input method"; + homepage = https://github.com/libpinyin/ibus-libpinyin; + license = licenses.gpl2; + platforms = platforms.linux; + }; + + #configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; + + buildInputs = [ + ibus glib sqlite libpinyin python3 gtk3 db + ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + src = fetchurl { + url = "mirror://sourceforge/project/libpinyin/ibus-libpinyin/ibus-libpinyin-${version}.tar.gz"; + sha256 = "c2085992f76ca669ebe4b7e7c0170433bbfb61f764f8336b3b17490b9fb1c334"; + }; +} diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index fbe7188ef9ac9..944d6de1084ae 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext}: +{ stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "m17n-db-1.7.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; configureFlags = stdenv.lib.optional (stdenv ? glibc) - "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps" + "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps" ; meta = { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a06d3d0729a15..6836ee46ba149 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, gmp ? null +{ lib, stdenv, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo @@ -32,9 +32,11 @@ let sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh ''; + outputs = [ "out" "info" ]; + + nativeBuildInputs = [ perl xz.bin ]; configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; - nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 51b9a1e847e6c..617cd5f554813 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ - -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \ + -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile sed -r \ diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix new file mode 100644 index 0000000000000..e113bd86bac37 --- /dev/null +++ b/pkgs/tools/misc/duc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, tokyocabinet, cairo, pango, ncurses }: + +stdenv.mkDerivation rec { + name = "duc-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "http://duc.zevv.nl/release/${name}.tar.gz"; + sha256 = "09mp8cq6s43sfhvms4mwhx3lw51vkaxgg34fbfbimafyjh4jdx3k"; + }; + + buildInputs = [ pkgconfig tokyocabinet cairo pango ncurses ]; + + meta = with stdenv.lib; { + homepage = http://duc.zevv.nl/; + description = "Collection of tools for inspecting and visualizing disk usage"; + license = licenses.gpl2; + + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix new file mode 100644 index 0000000000000..60a2ed29bbf89 --- /dev/null +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "dumptorrent-${version}"; + version = "1.2"; + + src = fetchurl { + url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; + sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ./dumptorrent $out/bin + ''; + + meta = with stdenv.lib; { + description = "Dump .torrent file information"; + homepage = https://sourceforge.net/projects/dumptorrent/; + license = licenses.gpl2; + maintainers = [ maintainers.zohl ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index e18b115df87c0..c6bca6e9d8f66 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat - substituteInPlace entr.c --replace /usr/bin/clear ${ncurses}/bin/clear + substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear substituteInPlace entr.1 --replace /bin/cat cat substituteInPlace entr.1 --replace /usr/bin/clear clear ''; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index b6ab3985f2398..1271aa8c98638 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; + outputs = [ "out" "info" ]; + crossAttrs = { # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html configureFlags = [ "gl_cv_func_wcwidth_works=yes" ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d56f9b3ce0f0f..15b1740638e2b 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -100,6 +100,9 @@ stdenv.mkDerivation rec { postInstall = '' paxmark pms $out/sbin/grub-{probe,bios-setup} + + # Avoid a runtime reference to gcc + sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index 809d0c65c6ece..bf868790de2d3 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation { ]; cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec ''; diff --git a/pkgs/tools/misc/mcrl2/default.nix b/pkgs/tools/misc/mcrl2/default.nix deleted file mode 100644 index a67081d5ef21e..0000000000000 --- a/pkgs/tools/misc/mcrl2/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, mesa, wxGTK, libX11}: - -stdenv.mkDerivation { - name = "mcrl2-200901"; - src = fetchurl { - url = http://www.win.tue.nl/mcrl2/download/release/mcrl2-200901-src.tar.bz2 ; - sha256 = "0lji31d7dv15q8092b8g01j023dd7miq3nw8klgc8jd136xpwdp9"; - }; - - buildInputs = [ mesa wxGTK libX11 ] ; -} - - - diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index b79f43cfbc35c..77fcb186ef1de 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { --wine-path=${wine_custom} \ --gpg-exec=${gnupg}/bin/gpg2 \ --bash-interp=${bash}/bin/bash \ - --downloader=${curl}/bin/curl + --downloader=${curl.bin}/bin/curl $configureFlags ''; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 40540ad1c20db..a1a12a82471d5 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin:${spidermonkey}/bin" + wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin" done ''; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 55c44770c3e17..2c1f3d77def3f 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${parallel}/bin:${sqlite}/bin" + --prefix PATH : "${parallel}/bin:${sqlite.bin}/bin" ''; meta = { diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 4c60e790238e6..0d2982c022f9d 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }: +{ stdenv, fetchurl, makeWrapper +, dpkg, patchelf +, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, libudev }: +let + inherit (stdenv) lib; + LD_LIBRARY_PATH = lib.makeLibraryPath + [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ]; +in stdenv.mkDerivation rec { version = "2.6.0"; name = "staruml-${version}"; @@ -16,13 +23,13 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; nativeBuildInputs = [ makeWrapper ]; - + unpackPhase = '' mkdir pkg dpkg-deb -x $src pkg sourceRoot=pkg ''; - + installPhase = '' mkdir $out mv opt/staruml $out/bin @@ -30,14 +37,14 @@ stdenv.mkDerivation rec { ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/StarUML - + mkdir -p $out/lib - + ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ - ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so.1 $out/lib/libudev.so.0 wrapProgram $out/bin/StarUML \ - --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 7b57458bd3f44..e20dc850008ae 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; - paths = lib.makeSearchPath "bin" + paths = lib.makeBinPath ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy gawk gnugrep coreutils ] diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index aab229c0ad220..7bd79b3088598 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchurl, ncurses, libevent, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, libevent, pkgconfig }: + +let + + bashCompletion = fetchFromGitHub { + owner = "przepompownia"; + repo = "tmux-bash-completion"; + rev = "678a27616b70c649c6701cae9cd8c92b58cc051b"; + sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf"; + }; + +in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.1"; + version = "2.2"; - src = fetchurl { - url = "https://github.com/tmux/tmux/releases/download/${version}/${name}.tar.gz"; - sha256 = "0xk1mylsb08sf0w597mdgj9s6hxxjvjvjd6bngpjvvxwyixlwmii"; + src = fetchFromGitHub { + owner = "tmux"; + repo = "tmux"; + rev = version; + sha256 = "04k9yxjp357sdw6365z6qx87vmwygl3v3wpvd78pp63ky5hzbbay"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ ncurses libevent ]; @@ -20,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc/bash_completion.d - cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux + cp -v ${bashCompletion}/completions/tmux $out/etc/bash_completion.d/tmux ''; meta = { @@ -44,6 +57,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thammers ]; + maintainers = with stdenv.lib.maintainers; [ thammers fpletz ]; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index e3adbfe3887d3..75b3cb160671e 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { src = ./nix-paths.patch; df = "${coreutils}/bin/df"; python = "${python2}/bin/${python2.executable}"; - libc = "${stdenv.cc.libc}/lib/libc.so.6"; + libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; }) # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3 diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 4206f468ec76f..6fc4e436153fe 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { substituteInPlace planet.py \ --replace "#!/usr/bin/env python" "#!${python}/bin/python" substituteInPlace tests/test_apply.py \ - --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" substituteInPlace planet/shell/xslt.py \ - --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" ''; doCheck = true; diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index debc2c239ad63..ce5a00708f99d 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf , libxml2, bzip2 }: -stdenv.mkDerivation { - name = "wv-1.2.4"; +stdenv.mkDerivation rec { + pname = "wv"; + version = "1.2.9"; + name = "${pname}-${version}"; src = fetchurl { - url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz; - sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ]; diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 30aba19930c70..1f4dbc8633270 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -18,7 +18,7 @@ let EndSection Section "Files" - ModulePath "${xorg.xorgserver}/lib/xorg/modules" + ModulePath "${xorg.xorgserver.out}/lib/xorg/modules" ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" XkbDir "${xkeyboard_config}/share/X11/xkb" FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" @@ -75,7 +75,7 @@ let in writeScriptBin "xdummy" '' #!${stdenv.shell} export XKB_BINDIR="${xorg.xkbcomp}/bin" - exec ${xorg.xorgserver}/bin/Xorg \ + exec ${xorg.xorgserver.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ "$@" \ diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 31b6e74917e88..abca512b1d08c 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeSearchPath "bin" [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 162fb73b3f00e..f1cf044243496 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { wrapProgram $out/bin/xvfb-run \ --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a7bb5a3083d91..a10fd37da2814 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,18 +12,18 @@ buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.02.13"; + version = "2016.04.06"; src = fetchurl { - url = "http://yt-dl.org/downloads/${stdenv.lib.getVersion name}/${name}.tar.gz"; - sha256 = "0d6ml6nas0pnp6is73fn326ayxkdmxvarzyr96qd6gyjm9icpdcb"; + url = "http://yt-dl.org/downloads/${version}/${name}.tar.gz"; + sha256 = "1kdrjwrn0x1wmvansvd2222gfqnld4zdihf2jwnz36112r1p8nhi"; }; buildInputs = [ makeWrapper zip pandoc ]; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. postInstall = stdenv.lib.optionalString (ffmpeg != null) - ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; + ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg.bin}/bin"''; # Requires network doCheck = false; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8cb6172d87b60..189be8be9e265 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "1l4gzz3yr0cl6a9xdy7843c5sb7afyq0i80wi2hasfpfdx5k95mz"; + sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 906ca5f39dd3b..32cf5750c6a49 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchurl, nodejs, which, python27, utillinux }: -let - version = "16"; # see ${src}/util/version/Version.h - date = "20150509"; -in +let version = "17.3"; in stdenv.mkDerivation { - name = "cjdns-${version}-${date}"; + name = "cjdns-"+version; - src = fetchFromGitHub { - owner = "cjdelisle"; - repo = "cjdns"; - rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867"; - sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29"; + src = fetchurl { + url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; + sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri"; }; buildInputs = [ which python27 nodejs ] ++ # for flock - stdenv.lib.optional stdenv.isLinux [ utillinux ]; + stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + "bash do"; installPhase = '' - installBin cjdroute makekeys privatetopublic publictoip6 + install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 sed -i 's,/usr/bin/env node,'$(type -P node), \ $(find contrib -name "*.js") sed -i 's,/usr/bin/env python,'$(type -P python), \ @@ -35,7 +30,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ehmry ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 24010e20f3749..5c8b801dbbe38 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase makeWrapper ]; configurePhase = '' + runHook preConfigure substituteInPlace ./cmst.pro \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/usr/share" @@ -28,11 +29,14 @@ stdenv.mkDerivation rec { substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ --replace "/usr/share" "$out/share" + runHook postConfigure ''; buildPhase = '' + runHook preBuild qmake PREFIX=$out make + runHook postBuild ''; postInstall = '' diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c59ea619942d7..6008afa278728 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx"; }; + outputs = [ "dev" "out" "bin" "man" "docdev" ]; + nativeBuildInputs = [ pkgconfig perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -62,6 +64,11 @@ stdenv.mkDerivation rec { CXX = "g++"; CXXCPP = "g++ -E"; + postInstall = '' + moveToOutput bin/curl-config "$dev" + sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la + ''; + crossAttrs = { # We should refer to the cross built openssl # For the 'urandom', maybe it should be a cross-system option diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 565a83047efe5..23f081c8be35b 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd; + outputs = [ "out" "man" ]; + meta = { description = "A tool for securing communications between a client and a DNS resolver"; homepage = https://dnscrypt.org/; diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index e49c32aac704b..493243cf81c8c 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { for prog in $(find "$out/share/easy-rsa" -executable -type f); do makeWrapper "$prog" "$out/bin/$(basename $prog)" \ --set EASY_RSA "$out/share/easy-rsa" \ - --set OPENSSL "${openssl}/bin/openssl" \ + --set OPENSSL "${openssl.bin}/bin/openssl" \ --set GREP "${gnugrep}/bin/grep" done sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 2b41f8ca1d3cf..59d97a4a18b62 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa substituteInPlace $out/bin/easyrsa \ --subst-var out \ - --subst-var-by openssl ${openssl}/bin/openssl + --subst-var-by openssl ${openssl.bin}/bin/openssl # Helper utility cat > $out/bin/easyrsa-init <<EOF diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index af6eff5c31e95..f846a711aa4a8 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' for program in gupnp-av-cp gupnp-universal-cp; do wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" done ''; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index b1bfeb215f68c..dbb85f3863549 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.24"; + name = "i2p-0.9.25"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0hk28cigil6ia707zb6p8n7959xg7v816bacxxlln780cc1wi830"; + sha256 = "1lj4khln0k0b4f55hjighwn5j3cyal8flmapjmadjyj6cd5py0v8"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index eca416b53d4ed..a92c343285798 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ ]; - configureFlags = "--with-ncurses-include-dir=${ncurses}/include"; + configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include"; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 10a951f84fc16..7c2a437ab658a 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' for i in $(find $out/bin/ -type f); do wrapProgram "$i" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index c0944bb891ec2..9e8e0c180d7ec 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation { buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; + postInstall = '' + mkdir -p $out/share/man/man{5,8} + cp minidlna.conf.5 $out/share/man/man5 + cp minidlnad.8 $out/share/man/man8 + ''; + meta = with stdenv.lib; { description = "Media server software"; longDescription = '' diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 93b20704620ae..742e6a93b6559 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configurePhase = '' patchShebangs configure substituteInPlace configure --replace "which" "command -v" - NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure + NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure ''; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d2e2215831b73..5e8931579cb30 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/nm-applet" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --prefix PATH ":" "${gnome3.gconf}/bin" diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 7403490e58f8e..afdca314ae649 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz -, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables +, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - buildInputs = [ wirelesstools udev libgudev libnl libuuid polkit ppp libndp + buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index daeb7ffb57bb8..fc89ea8db51b6 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, libevent }: - +{ stdenv, fetchurl, libevent, buildEnv }: +let + # failed to find a better way to make it work + libevent-comb = buildEnv { + inherit (libevent.out) name; + paths = [ libevent.dev libevent.out ]; + }; +in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { @@ -9,7 +15,7 @@ stdenv.mkDerivation { patches = [ ./configure-use-solib.patch ]; - configureFlags = [ "--with-libevent=${libevent}" ]; + configureFlags = [ "--with-libevent=${libevent-comb}" ]; buildInputs = [ libevent ]; diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix index 54239b7661743..43e48e9a4cdfe 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { preConfigure = '' export PKG_CONFIG=${pkgconfig}/bin/pkg-config - export LIBXML2_CFLAGS="-I ${libxml2}/include/libxml2" - export LIBXML2_LIBS="-L${libxml2}/lib -lxml2" + export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" + export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" ''; configureFlags = [ diff --git a/pkgs/tools/networking/openssh/CVE-2015-8325.patch b/pkgs/tools/networking/openssh/CVE-2015-8325.patch new file mode 100644 index 0000000000000..c752726aeae7c --- /dev/null +++ b/pkgs/tools/networking/openssh/CVE-2015-8325.patch @@ -0,0 +1,28 @@ +From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001 +From: Damien Miller <djm@mindrot.org> +Date: Wed, 13 Apr 2016 10:39:57 +1000 +Subject: [PATCH] ignore PAM environment vars when UseLogin=yes + +If PAM is configured to read user-specified environment variables +and UseLogin=yes in sshd_config, then a hostile local user may +attack /bin/login via LD_PRELOAD or similar environment variables +set via PAM. + +CVE-2015-8325, found by Shayan Sadigh, via Colin Watson +--- + session.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/session.c b/session.c +index 4859245..4653b09 100644 +--- a/session.c ++++ b/session.c +@@ -1322,7 +1322,7 @@ do_setup_env(Session *s, const char *shell) + * Pull in any environment variables that may have + * been set by PAM. + */ +- if (options.use_pam) { ++ if (options.use_pam && !options.use_login) { + char **p; + + p = fetch_pam_child_environment(); diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 79c9613ee4c9f..064745f885589 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation rec { ''; patches = - [ ./locale_archive.patch + [ + ./locale_archive.patch ./fix-host-key-algorithms-plus.patch + ./CVE-2015-8325.patch ] ++ optional withGssapiPatches gssapiSrc; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 5f335c8f76a9e..ec2821f4d8186 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ bison pkgconfig ]; buildInputs = [ glib gtk libxml2 gettext zlib ]; - NIX_LDFLAGS = "-rpath ${zlib}/lib"; + NIX_LDFLAGS = "-rpath ${zlib.out}/lib"; configureScript = "./Configure"; dontAddPrefix = true; configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true"; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 28dce0f567e91..621e71c9eae2d 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl +{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl , pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake , libtool, seeks_confDir ? "" }: @@ -13,14 +13,14 @@ stdenv.mkDerivation { }; buildInputs = - [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig + [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool ]; configureFlags = [ # Enable the built-in web server providing a web search interface. "--enable-httpserv-plugin=yes" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" ]; preConfigure = '' diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 5f1d6b4ef1a4b..aa1b01c11fad4 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,13 +6,13 @@ # some loss of functionality because of it. pythonPackages.buildPythonApplication rec { - version = "1.10.2"; + version = "1.11.0"; name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-${version}.tar.bz2"; - sha256 = "1rvv0ik5biy7ji8pg56v0qycnggzr3k6dbg88n555nb6r4cxgmgy"; + url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; + sha256 = "0hrp87rarbmmpnrxk91s83h6irkykds3pl263dagcddbdl5inqdi"; }; patchPhase = '' @@ -30,7 +30,6 @@ pythonPackages.buildPythonApplication rec { sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; - # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. @@ -48,8 +47,8 @@ pythonPackages.buildPythonApplication rec { ''; checkPhase = '' - # TODO: broken with wheels - #${pythonPackages.python.interpreter} setup.py trial + # Still broken. ~ C. + # trial allmydata ''; meta = { @@ -60,9 +59,9 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://allmydata.org/; + homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - maintainers = [ lib.maintainers.simons ]; + maintainers = with lib.maintainers; [ simons MostAwesomeDude ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix index 0c10e6655b8e1..f0f379d382951 100644 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; }; - NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index dd07e53ee6f9d..bc6b2b0e5dedb 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { [ ( substituteAll { src = ./nix-purity.patch; inherit libpcap; - glibc = stdenv.cc.libc; + glibc = stdenv.cc.libc.dev or stdenv.cc.libc; }) # Without nonpriv.patch, pppd --version doesn't work when not run as # root. diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 7242417bf2be2..1149d9aa8e4e1 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { c-ares ]; + NIX_CFLAGS_COMPILE = "--std=gnu89"; + src = fetchurl { url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz"; sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index edbf32bb775a2..f639044a195d3 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be"; }; + outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB + buildInputs = [ openssl expat libevent ]; configureFlags = [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--with-libexpat=${expat}" - "--with-libevent=${libevent}" + "--with-libevent=${libevent.dev}" "--localstatedir=/var" "--sysconfdir=/etc" "--sbindir=\${out}/bin" @@ -24,6 +26,12 @@ stdenv.mkDerivation rec { installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; + # get rid of runtime dependencies on $dev outputs + postInstall = ''substituteInPlace "$lib/lib/libunbound.la" '' + + stdenv.lib.concatMapStrings + (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ") + [ openssl expat libevent ]; + meta = with stdenv.lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 8ad9309516073..67b53c83448f0 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-2.0"; + name = "urlwatch-2.1"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0j38qzw4jxw41vnnpi6j851hqpv8d6p1cbni6cv8r2vqf5307s3b"; + sha256 = "0xn435cml9wjwk39117p1diqmvw3jbmv9ccr7230iaf7z59vf9v6"; }; propagatedBuildInputs = with python3Packages; [ - keyring minidb pyyaml + requests2 ]; postFixup = '' diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index e7c7716184808..69b3e633f379b 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patchPhase = '' - sed -i -e s,/usr/local/ssl,${openssl}, \ - src/osdep/unix/Makefile + sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl},' + sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,' + sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' ''; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index a6d2913abf66c..9b9909a89432b 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1jcpvl5sxb2ag8yahpy370c5jlfb097a21k2mhsidh4wxdhrnmgy"; }; + patches = [ ./remove-runtime-dep-on-openssl-headers.patch ]; + preConfigure = '' for i in "doc/texi2pod.pl" "util/rmold.pl"; do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch new file mode 100644 index 0000000000000..a6a1fcfcb37b1 --- /dev/null +++ b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch @@ -0,0 +1,17 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 1a36a9b..e279c84 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -2211,10 +2211,9 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a + echo '' >> $@ + echo '#include "version.h"' >> $@ + echo 'const char *version_string = "@VERSION@";' >> $@ +- echo 'const char *compilation_string = "'$(COMPILE)'";' \ ++ echo 'const char *compilation_string = 0;' \ + | $(ESCAPEQUOTE) >> $@ +- echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ ++ echo 'const char *link_string = 0;' \ + | $(ESCAPEQUOTE) >> $@ + + css.c: $(srcdir)/css.l diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 9f5f777a239b3..e05a65d6967e2 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl lzo zlib gcc iproute ]; installPhase = '' - installBin zerotier-one + install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool ln -s $out/bin/zerotier-one $out/bin/zerotier-cli ''; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index c47f1664cd6ec..fea6ccedd34f3 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { substituteInPlace checkinstallrc-dist --replace /usr/local $out substituteInPlace installwatch/create-localdecls \ - --replace /usr/include/unistd.h ${stdenv.glibc}/include/unistd.h + --replace /usr/include/unistd.h ${stdenv.glibc.dev}/include/unistd.h ''; postInstall = diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index e70659aff00f7..aa109ab80fe3e 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -36,8 +36,8 @@ in rec { nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; - nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion]; - nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; + nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 608fb31df783f..16078906bc2b5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -9,7 +9,7 @@ let common = { name, src }: stdenv.mkDerivation rec { inherit name src; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ perl pkgconfig ]; @@ -22,8 +22,8 @@ let # would end up using the wrong bzip2 when cross-compiling. # XXX: The right thing would be to reinstate `--with-bzip2' in Nix. postUnpack = - '' export CPATH="${bzip2}/include" - export LIBRARY_PATH="${bzip2}/lib" + '' export CPATH="${bzip2.dev}/include" + export LIBRARY_PATH="${bzip2.out}/lib" export CXXFLAGS="-Wno-error=reserved-user-defined-literal" ''; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix new file mode 100644 index 0000000000000..88bd8f4603758 --- /dev/null +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc, perlPackages, libsodium +, storeDir ? "/nix/store" +, stateDir ? "/nix/var" +}: + +stdenv.mkDerivation rec { + name = "nix-1.9pre4100_4bbcfaf"; + + src = fetchurl { + url = "http://hydra.nixos.org/build/21565942/download/4/${name}.tar.xz"; + sha256 = "1jcy0n8mi17k5vk89vammfh74lvsgnm4gjsk23cq1shspjnbbgxs"; + }; + + nativeBuildInputs = [ perl pkgconfig ]; + + buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium; + + propagatedBuildInputs = [ boehmgc ]; + + # Note: bzip2 is not passed as a build input, because the unpack phase + # would end up using the wrong bzip2 when cross-compiling. + # XXX: The right thing would be to reinstate `--with-bzip2' in Nix. + postUnpack = + '' export CPATH="${bzip2.dev}/include" + export LIBRARY_PATH="${bzip2.out}/lib" + export CXXFLAGS="-Wno-error=reserved-user-defined-literal" + ''; + + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} + --disable-init-state + --enable-gc + ''; + + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + + doInstallCheck = true; + + crossAttrs = { + postUnpack = + '' export CPATH="${bzip2.crossDrv}/include" + export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS" + ''; + + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} + --disable-init-state + --enable-gc + '' + stdenv.lib.optionalString ( + stdenv.cross ? nix && stdenv.cross.nix ? system + ) ''--with-system=${stdenv.cross.nix.system}''; + + doInstallCheck = false; + }; + + enableParallelBuilding = true; + + meta = { + description = "The Nix Deployment System"; + homepage = http://nixos.org/; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 7b5281220fab0..24346fb0eb70a 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${elfutils}/include"; NIX_CFLAGS_LINK = "-L${elfutils}/lib"; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 814fb0ea0ecc5..1f999e9d726d0 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip ] + ++ stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; patches = [ ./00-chntpw-build-arch-autodetect.patch diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index bde9756ee1a0e..eac237f2ff47f 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildPhase = '' substituteInPlace cipherscan \ --replace "@OPENSSLBIN@" \ - "${openssl}/bin/openssl" \ + "${openssl.bin}/bin/openssl" \ --replace "@TIMEOUTBIN@" \ "${coreutils}/bin/timeout" \ --replace "@READLINKBIN@" \ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace analyze.py \ --replace "@OPENSSLBIN@" \ - "${openssl}/bin/openssl" + "${openssl.bin}/bin/openssl" ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 0a172935bb597..bebb8a95a58ab 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99"; + version = "0.99.1"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "1abyg349yr31z764jcgx67q5v098jrkrj88bqkzmys6xza62qyfj"; + sha256 = "12nm4mxzx3qlbm65cadflzncjfkxdfqcp0lch29i5yfk4a8nhi71"; }; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 32cf4f9a4e2cf..85409fae85b93 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.13"; + version = "4.1.14"; src = fetchFromGitHub { - sha256 = "1fkazhw6gs191w789fnp6mwnxrx9p38b3kh5bngb1ir0zhkgghkq"; + sha256 = "1gj08dylcwdfjmdci1ja853n9xqkhgxy0x8m30bks81qwbnd12lp"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 2f3101cffea8c..09754f53a9edd 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, pkgconfig , curl, apacheHttpd, pcre, apr, aprutil, libxml2 }: with lib; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ]; configureFlags = [ "--enable-standalone-module" diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 15937a6792e69..a565c3b96e14e 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { patchShebangs . ''; - NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; buildInputs = [ autoconf automake openssl libxml2 ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 56e20726793d6..534e06814e2b5 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out/share/bash-completion/completions" mkdir -p "$out/share/zsh/site-functions" - mkdir -p "$out/share/fish/completions" + mkdir -p "$out/share/fish/vendor_completions.d" ''; installFlags = [ "PREFIX=$(out)" ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { '' else ""} ''; - wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([ + wrapperPath = with stdenv.lib; makeBinPath ([ coreutils gnused getopt diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 94dca5dca6800..45cd0f0e20b0e 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -a $src/config.example $out/share/doc/rofi-pass/config.example ''; - wrapperPath = with stdenv.lib; makeSearchPath "bin/" [ + wrapperPath = with stdenv.lib; makeBinPath [ coreutils findutils gnugrep diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index af0090cdf965e..2932143fa0e10 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -3,7 +3,7 @@ , perl, pcscperl, Glib, Gtk2, Pango }: -let deps = lib.makeSearchPath "bin" [ wget coreutils ]; +let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { name = "pcsc-tools-1.4.25"; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index b36c11cf9345b..f9bd6ea50e8d9 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { cp -R . $out cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ + --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix new file mode 100644 index 0000000000000..4bd1996867631 --- /dev/null +++ b/pkgs/tools/security/softhsm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, botan }: + +stdenv.mkDerivation rec { + + name = "softhsm-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "https://dist.opendnssec.org/source/${name}.tar.gz"; + sha256 = "0399b06f196fbfaebe73b4aeff2e2d65d0dc1901161513d0d6a94f031dcd827e"; + }; + + configureFlags = [ + "--with-crypto-backend=botan" + "--with-botan=${botan}" + "--sysconfdir=$out/etc" + "--localstatedir=$out/var" + ]; + + buildInputs = [ botan ]; + + postInstall = "rm -rf $out/var"; + + meta = { + homepage = https://www.opendnssec.org/softhsm; + description = "Cryptographic store accessible through a PKCS #11 interface"; + license = stdenv.lib.licenses.bsd2; + maintainers = stdenv.lib.maintainers.leenaars; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 4a8d7518e9c28..4111957476787 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -3,10 +3,10 @@ pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.77.2"; + version = "0.78.0"; src = fetchurl { - sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10"; + sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index df8024e040e32..b2af5451b8b55 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.15"; + name = "sudo-1.8.16"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3"; + sha256 = "0k86sm9ilhxhvnfwq3092zhfxazj3kddn0y2mirz0nqjqmpq50rd"; }; configureFlags = [ diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index c06636dc36777..a06754cb58d21 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: +{ stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: with stdenv.lib; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib" - substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include" + substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92.lib}/lib" + substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include" ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libidn ncurses pcre libssh ]; meta = { diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 6c4d61d825f94..365379c8f6a8d 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \ - --set TERMINFO "${ncurses}/share/terminfo" \ + --set TERMINFO "${ncurses.out}/share/terminfo" \ --set TERM "xterm" done ''; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index e910241113b98..d57aa8c63a92f 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Fix broken libtool file preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la + sed 's,-lcrypto,-L${openssl.out}/lib -lcrypto,' -i $out/lib/libtspi.la ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 117a3c1c1a2db..6d162188a539a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, boost, cmake, curl, libyamlcpp, openssl, utillinux }: +{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz"; - sha256 = "1ngp3xjdh6x1w7lsi4lji2xzqp0x950jngcdlq11lcr0wfnzwyxj"; + sha256 = "0k2k92y42zb6vf542zwkhvg15kv32yb4zvw6nlcqlgmyg19c5qmv"; }; - buildInputs = [ boost cmake curl libyamlcpp openssl utillinux ]; + buildInputs = [ boost cmake curl leatherman libyamlcpp openssl utillinux ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 264dbf1eb2795..0b034819651dc 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.mac --replace \ " -I/opt/local/include -I /usr/local/include -I/opt/local/include" "" substituteInPlace Makefile.mac --replace \ - "/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib" + "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib" ''; buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 1b15fbbb62814..0ee32a49c07bf 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl-incl-dir=${openssl}/include" - "--with-ssl-lib-dir=${openssl}/lib" + "--with-ssl-lib-dir=${openssl.out}/lib" ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; meta = { diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix new file mode 100644 index 0000000000000..28ec7f1be4273 --- /dev/null +++ b/pkgs/tools/system/netdata/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig }: + +stdenv.mkDerivation rec{ + version = "1.0.0"; + name = "netdata-${version}"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "firehol"; + repo = "netdata"; + sha256 = "03107ny98zks05p44jzypkk4lw8lbvmqja5b537ln6cnrgp20yvq"; + }; + + buildInputs = [ autoreconfHook zlib pkgconfig ]; + + patches = [ ./web_access.patch ]; + + meta = with stdenv.lib; { + description = "Real-time performance monitoring tool"; + homepage = http://netdata.firehol.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; + +} diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch new file mode 100644 index 0000000000000..3c0fbf7507d7e --- /dev/null +++ b/pkgs/tools/system/netdata/web_access.patch @@ -0,0 +1,19 @@ +--- a/src/web_client.c.orig 2016-04-17 11:34:20.044455323 +0200 ++++ b/src/web_client.c 2016-04-17 11:34:47.432897957 +0200 +@@ -291,14 +291,14 @@ + buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", filename); + return 404; + } +- ++#if 0 + // check if the file is owned by us + if(stat.st_uid != web_files_uid()) { + error("%llu: File '%s' is owned by user %d (I run as user %d). Access Denied.", w->id, webfilename, stat.st_uid, getuid()); + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", filename); + return 403; + } +- ++#endif + if((stat.st_mode & S_IFMT) == S_IFDIR) { + snprintf(webfilename, FILENAME_MAX+1, "%s/index.html", filename); + return mysendfile(w, webfilename); diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 2434889581ed3..15fcdcf6c9ddc 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config - echo X11=\"${libXt}/include\" >> LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include\" > LOCAL.config + echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do sed "s,/usr/local/plan9,${PLAN9},g" -i $f diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 3a78cb2baf637..70f792953b856 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; - inherit libXt; - inherit fontconfig; + libXt_dev = libXt.dev; + fontconfig_dev = fontconfig.dev; } diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 041dd96e1ca81..aa510a28c231b 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite mkdir -p $GOSQLITE cp -R $srcGoSqlite/* $GOSQLITE/ - export CGO_CFLAGS=-I${sqlite}/include - export CGO_LDFLAGS=-L${sqlite}/lib - go build -ldflags "-r ${sqlite}/lib" -o storebrowse + export CGO_CFLAGS=-I${sqlite.dev}/include + export CGO_LDFLAGS=-L${sqlite.out}/lib + go build -ldflags "-r ${sqlite.out}/lib" -o storebrowse ''; installPhase = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 4fcc0680ada65..d98f05c6aabb5 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, yacc }: +, riemann_c_client, protobufc, pcre, yacc }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ]; configureFlags = [ "--enable-dynamic-linking" diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 9fe9adaedadb3..dd28d5b2b1dad 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ./autogen.sh #--prefix="$out" ''; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index f8413b9a0d0f3..70a3bdeb7984e 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils ? null }: +{ stdenv, fetchurl, xz, coreutils ? null }: stdenv.mkDerivation rec { name = "diffutils-3.3"; @@ -8,8 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2"; }; + outputs = [ "out" "info" ]; + /* If no explicit coreutils is given, use the one from stdenv. */ - nativeBuildInputs = [ coreutils ]; + nativeBuildInputs = [ xz.bin coreutils ]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index e2856b7acaa4b..8578960b98753 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false +{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false , locale ? null }: +let + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "gawk-4.1.3"; @@ -9,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; }; + # When we do build separate interactive version, it makes sense to always include man. + outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man"; + doCheck = !( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults @@ -16,18 +22,17 @@ stdenv.mkDerivation rec { || stdenv.isFreeBSD ); - buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv - ++ stdenv.lib.optional readlineSupport readline + buildInputs = [ xz.bin ] + ++ stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv + ++ stdenv.lib.optional interactive readline ++ stdenv.lib.optional stdenv.isDarwin locale; configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" - ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" - # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) - ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; + ++ [(if interactive then "--with-readline=${readline}" else "--without-readline")]; postInstall = "rm $out/bin/gawk-*"; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/gawk/; description = "GNU implementation of the Awk programming language"; @@ -45,8 +50,11 @@ stdenv.mkDerivation rec { lines of code. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + + platforms = platforms.unix; maintainers = [ ]; }; } + diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 8ef67674cd21e..d618f842a4a5b 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { # Perl is needed for testing nativeBuildInputs = [ perl ]; + outputs = [ "out" "info" ]; # the man pages are rather small + buildInputs = [ pcre libiconv ]; # cygwin: FAIL: multibyte-white-space @@ -38,7 +40,7 @@ stdenv.mkDerivation { chmod +x $out/bin/egrep $out/bin/fgrep ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/grep/; description = "GNU implementation of the Unix grep command"; @@ -48,10 +50,10 @@ stdenv.mkDerivation { prints the matching lines. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; passthru = {inherit pcre;}; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index b1c5910029dd7..037c2f17a63ba 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "gnused-4.2.2"; @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; + outputs = [ "out" "info" ]; + meta = { homepage = http://www.gnu.org/software/sed/; description = "GNU sed, a batch stream editor"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 039bff8c655a9..e08c10fd9ed2e 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { postInstall = '' # Remove example output with (random?) colors to # avoid non-determinism in the output - rm $out/share/doc/${name}/examples/hdtbl/*color*ps + rm $doc/share/doc/examples/hdtbl/*color*ps # Remove creation date - find $out/share/doc/${name} -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + find $doc/share/doc/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index d0e39add665ab..57a375d2a17b5 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -3,7 +3,7 @@ # This package requires a locale ru_RU.cp1251 locale entry. # Waiting for a better idea, I created it modifying a store file using: # localedef -f CP1251 -i ru_RU ru_RU.CP1251 -# The store file mentioned is in "${glibc}/lib/locale/locale-archive" +# The store file mentioned is in "${glibc.out}/lib/locale/locale-archive" stdenv.mkDerivation { name = "multitran-data-0.3"; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index c2b845064d914..b1d8525c4da3b 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; + outputs = [ "out" "man" ]; + meta = with stdenv.lib; { description = "A converter from Rich Text Format to other formats"; longDescription = '' diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 89adcc75b1951..000584a50e109 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)" + interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" patchelf --set-interpreter "$interpreter" "$out/bin/xidel" patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel" ''; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index b26582a6cc716..7c393c5241514 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -237,12 +237,12 @@ stdenv.mkDerivation rec { # We can remove PATH= when those impurities are fixed. sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ - -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt}/bin/xsltproc'|" \ + -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \ -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \ -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \ - -e "s|^XMLLINT =.*|XMLLINT = '${libxml2}/bin/xmllint'|" \ + -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \ -i a2x.py '' + '' diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 512efe497fa0f..a426356a09f53 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 408ef8ae263c0..18f9c99ee2406 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -37,16 +37,16 @@ stdenv.mkDerivation rec { sed -i 's|self.install_layout == "deb"|False|' setup.py '' + stdenv.lib.optionalString enableAllFeatures '' for file in $(find -name "*.py"); do - sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \ - -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \ + sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \ + -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \ -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \ -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \ -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \ -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \ -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \ -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ - -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \ - -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \ + -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ + -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix index 2cc6739390381..83dcd4b72cd4f 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix @@ -101,7 +101,8 @@ core = stdenv.mkDerivation rec { cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/" '' + /* doc location identical with individual TeX pkgs */ '' mkdir -p "$doc/doc" - mv "$out"/share/{man,info} "$doc"/doc + mv "$doc"/share/{man,info} "$doc"/doc + rmdir "$doc"/share '' + cleanBrokenLinks; setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index fbf4adde2ae72..a2f0bf706c870 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -104,6 +104,7 @@ let mkUrlName = { pname, tlType, ... }: pname + lib.optionalString (tlType != "run") ".${tlType}"; + # command to unpack a single TL package unpackPkg = { # url ? null, urlPrefix ? null md5, pname, tlType, postUnpack ? "", stripPrefix ? 1, ... @@ -119,6 +120,7 @@ let -C "$out" --anchored --exclude=tlpkg --keep-old-files '' + postUnpack; + # create a derivation that contains unpacked upstream TL packages mkPkgs = { pname, tlType, version, pkgList }@args: /* TODOs: - "historic" isn't mirrored; posted a question at #287 diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 56b093f921d11..550870b0a6a99 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -66,7 +66,7 @@ rec { # did the same thing in texLive, but couldn't get it to carry to the # binaries installed by texLiveFull for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "addInputs" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 74b3829cf89f5..48a5ae8d6499b 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -30,7 +30,7 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler}/lib" + export DYLD_LIBRARY_PATH="${poppler.out}/lib" '' + '' mkdir -p $out mkdir -p $out/nix-support @@ -54,7 +54,7 @@ rec { # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu.dev}/include/layout"; ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ ${args.lib.concatStringsSep " " configureFlags} @@ -106,7 +106,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; @@ -119,7 +119,7 @@ rec { "patchShebangsInterimLibexec" "patchShebangsInterimTexmfDist" "patchShebangsInterimShareTexmfDist"]; - buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto + buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11.out libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace gmp mpfr diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 49fe7dc681fe9..f99c14720760d 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${libxslt}/bin:${libxml2}/bin:${getopt}/bin" + --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 123dbf647f0d7..efce0c92b78f0 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - sed 's|\[curl|[${curl}/bin/curl|g' $src > $out/bin/aws + sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws chmod +x $out/bin/aws ''; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index dee14db46bcf7..6ccce4684ad5a 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i \ --set EC2_HOME $out \ - --prefix PATH : ${ruby}/bin:${openssl}/bin + --prefix PATH : ${ruby}/bin:${openssl.bin}/bin done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d07c4a68609a..3e89547389f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,7 +411,7 @@ in arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino = arduino-core.override { withGui = true; }; + arduino = self.arduino-core.override { withGui = true; }; arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; @@ -458,12 +458,12 @@ in amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (amule.override { + amuleDaemon = appendToName "daemon" (self.amule.override { monolithic = false; daemon = true; }); - amuleGui = appendToName "gui" (amule.override { + amuleGui = appendToName "gui" (self.amule.override { monolithic = false; client = true; }); @@ -496,16 +496,16 @@ in pkgs_i686 = pkgsi686Linux; }; - inherit (androidenv) androidsdk_4_4 androidndk; + inherit (self.androidenv) androidsdk_4_4 androidndk; - androidsdk = androidenv.androidsdk_6_0; + androidsdk = self.androidenv.androidsdk_6_0; arc-gtk-theme = callPackage ../misc/themes/arc { }; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; - aria = aria2; + aria = self.aria2; at = callPackage ../tools/system/at { }; @@ -637,7 +637,9 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - cabal2nix = haskellPackages.cabal2nix; + cabal2nix = self.haskellPackages.cabal2nix; + + caddy = go16Packages.caddy.bin // { outputs = [ "bin" ]; }; capstone = callPackage ../development/libraries/capstone { }; @@ -695,13 +697,15 @@ in contacts = callPackage ../tools/misc/contacts { }; + daemontools = callPackage ../tools/admin/daemontools { }; + datamash = callPackage ../tools/misc/datamash { }; ddate = callPackage ../tools/misc/ddate { }; deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; - dfilemanager = kde5.dfilemanager; + dfilemanager = self.kde5.dfilemanager; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; @@ -780,8 +784,6 @@ in mcrl = callPackage ../tools/misc/mcrl { }; - mcrl2 = callPackage ../tools/misc/mcrl2 { }; - meson = callPackage ../development/tools/build-managers/meson { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; @@ -854,12 +856,12 @@ in enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (asciidoc.override { + asciidoc-full = appendToName "full" (self.asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); - asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { + asciidoc-full-with-plugins = appendToName "full-with-plugins" (self.asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; enableExtraPlugins = true; @@ -956,9 +958,9 @@ in cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; - libceph = ceph.lib; + libceph = self.ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; - ceph-dev = ceph; + ceph-dev = self.ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); cfdg = callPackage ../tools/graphics/cfdg { }; @@ -988,7 +990,7 @@ in gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; - clementineFree = clementine.free; + clementineFree = self.clementine.free; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1039,6 +1041,10 @@ in anthy = callPackage ../tools/inputmethods/anthy { }; + libpinyin = callPackage ../development/libraries/libpinyin { }; + + ibus-libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; + m17n_db = callPackage ../tools/inputmethods/m17n-db { }; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; @@ -1060,6 +1066,10 @@ in inherit (python3Packages) pygobject3; }; + libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { + inherit (python3Packages) pygobject3; + }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { inherit (python3Packages) pygobject3; }; @@ -1144,9 +1154,9 @@ in cudatoolkit7 cudatoolkit75; - cudatoolkit = cudatoolkit7; + cudatoolkit = self.cudatoolkit7; - curlFull = curl.override { + curlFull = self.curl.override { idnSupport = true; ldapSupport = true; gssSupport = true; @@ -1296,7 +1306,7 @@ in doomseeker = callPackage ../applications/misc/doomseeker { }; - drive = go14Packages.drive.bin // { outputs = [ "bin" ]; }; + drive = self.go14Packages.drive.bin // { outputs = [ "bin" ]; }; driftnet = callPackage ../tools/networking/driftnet {}; @@ -1308,8 +1318,12 @@ in dub = callPackage ../development/tools/build-managers/dub { }; + duc = callPackage ../tools/misc/duc { }; + duff = callPackage ../tools/filesystems/duff { }; + dumptorrent = callPackage ../tools/misc/dumptorrent { }; + duo-unix = callPackage ../tools/security/duo-unix { }; duplicity = callPackage ../tools/backup/duplicity { @@ -1573,7 +1587,7 @@ in }; gawkInteractive = appendToName "interactive" - (gawk.override { readlineSupport = true; }); + (gawk.override { interactive = true; }); gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; }; @@ -1671,17 +1685,17 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; - gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + gnupg1 = self.gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; - gnupg = gnupg21; + gnupg = self.gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; - gnuplot_qt = gnuplot.override { withQt = true; }; + gnuplot_qt = self.gnuplot.override { withQt = true; }; # must have AquaTerm installed separately - gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; + gnuplot_aquaterm = self.gnuplot.override { aquaterm = true; }; gnused = callPackage ../tools/text/gnused { }; @@ -1765,15 +1779,15 @@ in trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = grub2_full; + grub2 = self.grub2_full; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2_full.override { + grub2_efi = self.grub2_full.override { efiSupport = true; }; - grub2_light = grub2_full.override { + grub2_light = self.grub2_full.override { zfsSupport = false; }; @@ -1866,16 +1880,16 @@ in mpi = null; }; - hdf5-mpi = appendToName "mpi" (hdf5.override { + hdf5-mpi = appendToName "mpi" (self.hdf5.override { szip = null; mpi = pkgs.openmpi; }); - hdf5-cpp = appendToName "cpp" (hdf5.override { + hdf5-cpp = appendToName "cpp" (self.hdf5.override { cpp = true; }); - hdf5-fortran = appendToName "fortran" (hdf5.override { + hdf5-fortran = appendToName "fortran" (self.hdf5.override { inherit gfortran; }); @@ -1967,7 +1981,7 @@ in imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { }; - imgurbash = callPackage ../tools/graphics/imgurbash { }; + imgurbash2 = callPackage ../tools/graphics/imgurbash2 { }; inadyn = callPackage ../tools/networking/inadyn { }; @@ -1987,9 +2001,9 @@ in iperf2 = callPackage ../tools/networking/iperf/2.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; - iperf = iperf3; + iperf = self.iperf3; - ipfs = goPackages.ipfs.bin // { outputs = [ "bin" ]; }; + ipfs = self.goPackages.ipfs.bin // { outputs = [ "bin" ]; }; ipmitool = callPackage ../tools/system/ipmitool { static = false; @@ -2007,12 +2021,14 @@ in ised = callPackage ../tools/misc/ised {}; - isl = isl_0_15; + isl = self.isl_0_15; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { }; + ispike = callPackage ../development/libraries/science/robotics/ispike { }; + isync = callPackage ../tools/networking/isync { }; isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { }; @@ -2130,6 +2146,8 @@ in mxt-app = callPackage ../misc/mxt-app { }; + netdata = callPackage ../tools/system/netdata { }; + netperf = callPackage ../applications/networking/netperf { }; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; @@ -2173,6 +2191,8 @@ in leafpad = callPackage ../applications/editors/leafpad { }; + leatherman = callPackage ../development/libraries/leatherman {}; + leela = callPackage ../tools/graphics/leela { }; lftp = callPackage ../tools/networking/lftp { }; @@ -2918,7 +2938,7 @@ in pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonDBus = dbus_python; + pythonDBus = self.dbus_python; pythonIRClib = pythonPackages.pythonIRClib; @@ -3202,6 +3222,8 @@ in snort = callPackage ../applications/networking/ids/snort { }; + softhsm = callPackage ../tools/security/softhsm { }; + solr = callPackage ../servers/search/solr { }; solvespace = callPackage ../applications/graphics/solvespace { }; @@ -3399,9 +3421,7 @@ in torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { - stdenv = overrideCC stdenv gcc5; - }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -3795,7 +3815,7 @@ in xflux = callPackage ../tools/misc/xflux { }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - libxfs = xfsprogs.lib; + libxfs = self.xfsprogs.dev; # outputs TODO xml2 = callPackage ../tools/text/xml/xml2 { }; @@ -3976,7 +3996,7 @@ in clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; }; - clangSelf = clangWrapSelf llvmPackagesSelf.clang; + clangSelf = self.clangWrapSelf llvmPackagesSelf.clang; clangWrapSelf = build: callPackage ../build-support/cc-wrapper { cc = build; @@ -4008,7 +4028,7 @@ in ocamlPackages = ocamlPackages_4_02; }); - cryptol = haskellPackages.cryptol; + cryptol = self.haskellPackages.cryptol; cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -4029,18 +4049,20 @@ in gcc = gcc5; - gcc_multi = + wrapCCMulti = cc: if system == "x86_64-linux" then lowPrio ( let extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" gcc.cc); + in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) - else throw "Multilib gcc not supported on ‘${system}’"; + else throw "Multilib ${cc.name} not supported on ‘${system}’"; + + gcc_multi = wrapCCMulti gcc; gcc_debug = lowPrio (wrapCC (gcc.cc.override { stripped = false; @@ -4272,7 +4294,14 @@ in releaseType = "update"; sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; }; - gcc-arm-embedded = gcc-arm-embedded-4_9; + gcc-arm-embedded-5_2 = pkgs.callPackage_i686 ../development/compilers/gcc-arm-embedded { + dirName = "5.0"; + subdirName = "5-2015-q4-major"; + version = "5.2-2015q4-20151219"; + releaseType = "major"; + sha256 = "12mbwl9iwbw7h6gwwkvyvfmrsz7vgjz27jh2cz9z006ihzigi50y"; + }; + gcc-arm-embedded = self.gcc-arm-embedded-4_9; gforth = callPackage ../development/compilers/gforth {}; @@ -4285,7 +4314,7 @@ in haskellPackages = haskell.packages.ghc7103.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; - inherit (haskellPackages) ghc cabal-install stack; + inherit (self.haskellPackages) ghc cabal-install stack; haxe = callPackage ../development/compilers/haxe { inherit (ocamlPackages) camlp4; @@ -4293,7 +4322,7 @@ in hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; hhvm = callPackage ../development/compilers/hhvm { }; - hiphopvm = hhvm; /* Compatibility alias */ + hiphopvm = self.hhvm; /* Compatibility alias */ hop = callPackage ../development/compilers/hop { }; @@ -4319,7 +4348,7 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_5; + go = self.go_1_5; go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; }; @@ -4339,7 +4368,7 @@ in xulrunner = firefox-unwrapped; }; - icedtea_web = icedtea8_web; + icedtea_web = self.icedtea8_web; idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; @@ -4369,44 +4398,44 @@ in bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; }; - openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; + openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; - jdk7 = openjdk7 // { outputs = [ "out" ]; }; - jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (openjdk7.jre // { outputs = [ "jre" ]; }); + jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; + jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (self.openjdk7.jre // { outputs = [ "jre" ]; }); - jdk8 = openjdk8 // { outputs = [ "out" ]; }; - jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; }); + jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; + jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (self.openjdk8.jre // { outputs = [ "jre" ]; }); - jdk = if stdenv.isDarwin then jdk7 else jdk8; - jre = if stdenv.isDarwin then jre7 else jre8; + jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; + jre = if stdenv.isDarwin then self.jre7 else self.jre8; - oraclejdk = pkgs.jdkdistro true false; + oraclejdk = self.jdkdistro true false; - oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejdk7 = self.oraclejdk7distro true false; - oraclejdk7psu = pkgs.oraclejdk7psu_distro true false; + oraclejdk7psu = self.oraclejdk7psu_distro true false; - oraclejdk8 = pkgs.oraclejdk8distro true false; + oraclejdk8 = self.oraclejdk8distro true false; - oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; + oraclejdk8psu = self.oraclejdk8psu_distro true false; - oraclejre = lowPrio (pkgs.jdkdistro false false); + oraclejre = lowPrio (self.jdkdistro false false); - oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + oraclejre7 = lowPrio (self.oraclejdk7distro false false); - oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false); + oraclejre7psu = lowPrio (self.oraclejdk7psu_distro false false); - oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); + oraclejre8 = lowPrio (self.oraclejdk8distro false false); - oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); + oraclejre8psu = lowPrio (self.oraclejdk8psu_distro false false); - jrePlugin = jre8Plugin; + jrePlugin = self.jre8Plugin; - jre6Plugin = lowPrio (pkgs.jdkdistro false true); + jre6Plugin = lowPrio (self.jdkdistro false true); - jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true); + jre7Plugin = lowPrio (self.oraclejdk7distro false true); - jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); + jre8Plugin = lowPrio (self.oraclejdk8distro false true); supportsJDK = system == "i686-linux" || @@ -4461,17 +4490,17 @@ in liquibase = callPackage ../development/tools/database/liquibase { }; - llvm = llvmPackages.llvm; + llvm = self.llvmPackages.llvm; - llvm_38 = llvmPackages_38.llvm; - llvm_37 = llvmPackages_37.llvm; - llvm_36 = llvmPackages_36.llvm; - llvm_35 = llvmPackages_35.llvm; - llvm_34 = llvmPackages_34.llvm; + llvm_38 = self.llvmPackages_38.llvm; + llvm_37 = self.llvmPackages_37.llvm; + llvm_36 = self.llvmPackages_36.llvm; + llvm_35 = self.llvmPackages_35.llvm; + llvm_34 = self.llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_37; + llvmPackages = recurseIntoAttrs self.llvmPackages_37; - llvmPackagesSelf = llvmPackages_34.override { + llvmPackagesSelf = self.llvmPackages_34.override { stdenv = libcxxStdenv; }; @@ -5186,6 +5215,8 @@ in angelscript = callPackage ../development/interpreters/angelscript {}; + angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {}; + chibi = callPackage ../development/interpreters/chibi { }; ceptre = callPackage ../development/interpreters/ceptre { }; @@ -5235,10 +5266,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; odbcSupport = true; }; - erlang = erlangR18; - erlang_odbc = erlangR18_odbc; - erlang_javac = erlangR18_javac; - erlang_odbc_javac = erlangR18_odbc_javac; + erlang = self.erlangR18; + erlang_odbc = self.erlangR18_odbc; + erlang_javac = self.erlangR18_javac; + erlang_odbc_javac = self.erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; @@ -5258,7 +5289,7 @@ in guile_2_0 = callPackage ../development/interpreters/guile { }; - guile = guile_2_0; + guile = self.guile_2_0; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -5276,6 +5307,8 @@ in lxappearance = callPackage ../applications/misc/lxappearance {}; + lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -5284,7 +5317,7 @@ in love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love = love_0_10; + love = self.love_0_10; ### LUA MODULES @@ -5299,22 +5332,22 @@ in lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix { compat = true; }; - lua5 = lua5_2_compat; - lua = lua5; + lua5 = self.lua5_2_compat; + lua = self.lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); - luaPackages = lua52Packages; + luaPackages = self.lua52Packages; - lua5_1_sockets = lua51Packages.luasocket; + lua5_1_sockets = self.lua51Packages.luasocket; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; luajit = callPackage ../development/interpreters/luajit {}; - luarocks = luaPackages.luarocks; + luarocks = self.luaPackages.luarocks; toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( @@ -5550,7 +5583,7 @@ in version = "2.8"; }; - amdappsdk = amdappsdk28; + amdappsdk = self.amdappsdk28; amdappsdkFull = callPackage ../development/misc/amdapp-sdk { version = "2.8"; @@ -5617,7 +5650,7 @@ in antlr3 = callPackage ../development/tools/parsing/antlr { }; - ant = apacheAnt; + ant = self.apacheAnt; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -5640,7 +5673,7 @@ in autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake115x; + automake = self.automake115x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; @@ -5670,7 +5703,7 @@ in bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; + binutils = if stdenv.isDarwin then self.darwin.binutils else self.binutils-raw; binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; @@ -5688,7 +5721,7 @@ in bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = bison3; + bison = self.bison3; bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; @@ -5729,16 +5762,22 @@ in # It can be used by setting in nixpkgs config like this, for example: # replaceStdenv = { pkgs }: pkgs.ccacheStdenv; # But if you build in chroot, you should have that path in chroot - # If instantiated directly, it will use the HOME/.ccache as cache directory. - # You can use an override in packageOverrides to set extraConfig: + # If instantiated directly, it will use $HOME/.ccache as the cache directory, + # i.e. /homeless-shelter/.ccache using the Nix daemon. + # You should specify a different directory using an override in + # packageOverrides to set extraConfig. + # + # Example using Nix daemon (i.e. multiuser Nix install or on NixOS): # packageOverrides = pkgs: { # ccacheWrapper = pkgs.ccacheWrapper.override { # extraConfig = '' - # CCACHE_COMPRESS=1 - # CCACHE_DIR=/bin/.ccache + # export CCACHE_COMPRESS=1 + # export CCACHE_DIR=/var/cache/ccache + # export CCACHE_UMASK=007 # ''; # }; - # + # You can use a different directory, but whichever directory you choose + # should be owned by user root, group nixbld with permissions 0770. ccacheWrapper = makeOverridable ({ extraConfig ? "" }: wrapCC (ccache.links extraConfig)) {}; ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); @@ -5789,9 +5828,9 @@ in inherit (darwin) ps; }; - cmakeCurses = cmake.override { useNcurses = true; }; + cmakeCurses = self.cmake.override { useNcurses = true; }; - cmakeWithGui = cmakeCurses.override { useQt4 = true; }; + cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; coccinelle = callPackage ../development/tools/misc/coccinelle { }; @@ -5869,7 +5908,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); + doxygen_gui = lowPrio (self.doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -5928,10 +5967,10 @@ in gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; - gnumake3 = gnumake382; + gnumake3 = self.gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; - gnumake = gnumake41; + gnumake = self.gnumake41; gob2 = callPackage ../development/tools/misc/gob2 { }; @@ -6004,7 +6043,7 @@ in lemon = callPackage ../development/tools/parsing/lemon { }; - libtool = libtool_2; + libtool = self.libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -6227,6 +6266,8 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; + travis = callPackage ../development/tools/misc/travis { }; + tweak = callPackage ../applications/editors/tweak { }; uhd = callPackage ../development/tools/misc/uhd { }; @@ -6245,7 +6286,7 @@ in inherit (gnu) mig; }; - gdbGuile = lowPrio (gdb.override { inherit guile; }); + gdbGuile = lowPrio (self.gdb.override { inherit guile; }); gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; @@ -6369,7 +6410,7 @@ in boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost = boost160; + boost = self.boost160; boost_process = callPackage ../development/libraries/boost-process { }; @@ -6447,7 +6488,7 @@ in clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - clucene_core = clucene_core_1; + clucene_core = self.clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; @@ -6513,22 +6554,22 @@ in # Make bdb5 the default as it is the last release under the custom # bsd-like license - db = db5; - db4 = db48; + db = self.db5; + db4 = self.db48; db44 = callPackage ../development/libraries/db/db-4.4.nix { }; db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; - db5 = db53; + db5 = self.db53; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; - db6 = db60; + db6 = self.db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; - dbus_python = pythonPackages.dbus; + dbus_python = self.pythonPackages.dbus; dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; @@ -6537,9 +6578,9 @@ in dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; # Should we deprecate these? Currently there are many references. - dbus_tools = pkgs.dbus.tools; - dbus_libs = pkgs.dbus.libs; - dbus_daemon = pkgs.dbus.daemon; + dbus_tools = self.dbus.out; + dbus_libs = self.dbus; + dbus_daemon = self.dbus.daemon; dee = callPackage ../development/libraries/dee { }; @@ -6616,10 +6657,10 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; # Aliases - ffmpeg_0 = ffmpeg_0_10; - ffmpeg_1 = ffmpeg_1_2; - ffmpeg_2 = ffmpeg_2_8; - ffmpeg = ffmpeg_2; + ffmpeg_0 = self.ffmpeg_0_10; + ffmpeg_1 = self.ffmpeg_1_2; + ffmpeg_2 = self.ffmpeg_2_8; + ffmpeg = self.ffmpeg_2; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin @@ -6642,9 +6683,9 @@ in ffms = callPackage ../development/libraries/ffms { }; 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"; }; + fftwSinglePrec = self.fftw.override { precision = "single"; }; + fftwFloat = self.fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = self.fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -6698,7 +6739,7 @@ in funambol = callPackage ../development/libraries/funambol { }; - fam = gamin; + fam = self.gamin; gamin = callPackage ../development/libraries/gamin { }; @@ -6714,7 +6755,7 @@ in gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_4 = callPackage ../development/libraries/gecode { }; - gecode = gecode_4; + gecode = self.gecode_4; gegl = callPackage ../development/libraries/gegl { }; @@ -6724,7 +6765,7 @@ in geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { + geoipWithDatabase = self.geoip.override { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; }; @@ -6764,7 +6805,7 @@ in glew = callPackage ../development/libraries/glew { }; glew110 = callPackage ../development/libraries/glew/1.10.nix { }; - glfw = glfw3; + glfw = self.glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; @@ -6824,7 +6865,7 @@ in gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = gmp5; + gmp = self.gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -6900,7 +6941,7 @@ in gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = gnutls34; + gnutls = self.gnutls34; gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; @@ -6942,7 +6983,7 @@ in }; glib = callPackage ../development/libraries/glib { }; - glib-tested = glib.override { # checked version separate to break cycles + glib-tested = self.glib.override { # checked version separate to break cycles doCheck = true; libffi = libffi.override { doCheck = true; }; }; @@ -6953,6 +6994,7 @@ in ace = callPackage ../development/libraries/ace { }; atk = callPackage ../development/libraries/atk { }; + atkmm = callPackage ../development/libraries/atkmm { }; pixman = callPackage ../development/libraries/pixman { }; @@ -6961,6 +7003,8 @@ in glSupport = config.cairo.gl or (stdenv.isLinux && !stdenv.isArm && !stdenv.isMips); }; + + cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; @@ -6982,7 +7026,7 @@ in gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - gtk = pkgs.gtk2; + gtk = self.gtk2; gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -7003,7 +7047,7 @@ in libgnomeprintui GConf gnomepanel; }; - gtk-sharp = gtk-sharp-2_0; + gtk-sharp = self.gtk-sharp-2_0; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; @@ -7023,10 +7067,10 @@ in # TODO : Let admin choose. # We are using mit-krb5 because it is better maintained - kerberos = libkrb5; + kerberos = self.libkrb5; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = heimdalFull.override { type = "lib"; }; + libheimdal = self.heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = callPackage ../development/libraries/harfbuzz { @@ -7038,7 +7082,7 @@ in herqq = callPackage ../development/libraries/herqq { }; - heyefi = haskellPackages.heyefi; + heyefi = self.haskellPackages.heyefi; hidapi = callPackage ../development/libraries/hidapi { libusb = libusb1; @@ -7169,11 +7213,11 @@ in krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5Full.override { type = "lib"; }; + libkrb5 = self.krb5Full.override { type = "lib"; }; LASzip = callPackage ../development/libraries/LASzip { }; - lcms = lcms1; + lcms = self.lcms1; lcms1 = callPackage ../development/libraries/lcms { }; @@ -7235,9 +7279,8 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; - libav = libav_11; # branch 11 is API-compatible with branch 10 - libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_11; + libav = self.libav_11; # branch 11 is API-compatible with branch 10 + inherit (callPackages ../development/libraries/libav { }) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -7256,10 +7299,10 @@ in libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = libcanberra.override { gtk = gtk3; }; + libcanberra_gtk3 = self.libcanberra.override { gtk = gtk3; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then libcanberra.override { gtk = null; } - else libcanberra; + then self.libcanberra.override { gtk = null; } + else self.libcanberra; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -7334,7 +7377,7 @@ in sqlite = null; }; - libdbiDrivers = libdbiDriversBase.override { + libdbiDrivers = self.libdbiDriversBase.override { inherit sqlite libmysql; }; @@ -7352,7 +7395,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = libdevil.override { + libdevil-nox = self.libdevil.override { libX11 = null; mesa = null; }; @@ -7449,7 +7492,7 @@ in liblo = callPackage ../development/libraries/liblo { }; - liblrdf = librdf; + liblrdf = self.librdf; liblscp = callPackage ../development/libraries/liblscp { }; @@ -7650,7 +7693,7 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then self.libjpeg_turbo else self.libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -7716,7 +7759,7 @@ in libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = libmusicbrainz3; + libmusicbrainz = self.libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; @@ -7783,7 +7826,7 @@ in libpgf = callPackage ../development/libraries/libpgf { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = libpng.override { apngSupport = true; }; + libpng_apng = self.libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpaper = callPackage ../development/libraries/libpaper { }; @@ -7904,7 +7947,7 @@ in libupnp = callPackage ../development/libraries/pupnp { }; - giflib = giflib_5_1; + giflib = self.giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -7937,9 +7980,9 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }); - libuv = libuvVersions.v1_7_5; + libuv = self.libuvVersions.v1_7_5; - libv4l = lowPrio (v4l_utils.override { + libv4l = lowPrio (self.v4l_utils.override { alsaLib = null; libX11 = null; qt4 = null; @@ -7947,6 +7990,7 @@ in }); libva = callPackage ../development/libraries/libva { }; + libva-full = libva.override { minimal = false; }; libvdpau = callPackage ../development/libraries/libvdpau { }; @@ -7975,7 +8019,7 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = libwnck2; + libwnck = self.libwnck2; libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; @@ -7999,14 +8043,18 @@ in libxmi = callPackage ../development/libraries/libxmi { }; - libxml2 = callPackage ../development/libraries/libxml2 { - pythonSupport = false; + libxml2 = callPackage ../development/libraries/libxml2 { }; + libxml2Python = pkgs.buildEnv { # slightly hacky + name = "libxml2+py-${self.libxml2.version}"; + paths = with self.libxml2; [ dev bin py ]; + inherit (self.libxml2) passthru; + # the hook to find catalogs is hidden by buildEnv + postBuild = '' + mkdir "$out/nix-support" + cp '${self.libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" + ''; }; - libxml2Python = lowPrio (libxml2.override { - pythonSupport = true; - }); - libxmlxx = callPackage ../development/libraries/libxmlxx { }; libxmp = callPackage ../development/libraries/libxmp { }; @@ -8096,7 +8144,7 @@ in ); mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_noglu mesa_glu ]; + paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ]; }); meterbridge = callPackage ../applications/audio/meterbridge { }; @@ -8193,7 +8241,7 @@ in newt = callPackage ../development/libraries/newt { }; nghttp2 = callPackage ../development/libraries/nghttp2 { }; - libnghttp2 = nghttp2.override { + libnghttp2 = self.nghttp2.override { prefix = "lib"; fetchurl = fetchurlBoot; }; @@ -8209,13 +8257,10 @@ in nspr = callPackage ../development/libraries/nspr { }; nss = lowPrio (callPackage ../development/libraries/nss { }); + nssTools = nss.tools; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - nssTools = callPackage ../development/libraries/nss { - includeTools = true; - }; - ntk = callPackage ../development/libraries/audio/ntk { }; ntrack = callPackage ../development/libraries/ntrack { }; @@ -8290,8 +8335,7 @@ in openslp = callPackage ../development/libraries/openslp {}; - # 2.3 breaks some backward-compability - libressl = libressl_2_2; + libressl = self.libressl_2_3; libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { fetchurl = fetchurlBoot; }; @@ -8342,17 +8386,10 @@ in vtk = vtkWithQt4; }; - pcre = callPackage ../development/libraries/pcre { - unicodeSupport = config.pcre.unicode or true; - }; - pcre16 = pcre.override { - cplusplusSupport = false; - withCharSize = 16; - }; - pcre32 = pcre.override { - cplusplusSupport = false; - withCharSize = 32; - }; + pcre = callPackage ../development/libraries/pcre { }; + pcre16 = self.pcre.override { variant = "pcre16"; }; + # pcre32 seems unused + pcre-cpp = self.pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -8447,7 +8484,7 @@ in libpng = libpng12; }; - qt4 = pkgs.kde4.qt4; + qt4 = self.kde4.qt4; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true @@ -8474,7 +8511,7 @@ in let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt5 = qt54; + qt5 = self.qt54; qt5LibsFun = self: with self; { @@ -8524,10 +8561,10 @@ in telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = callPackage ../applications/video/vlc { + vlc = lowPrio (callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; - }; + }); }; @@ -8757,7 +8794,7 @@ in sqlite-amalgamation = callPackage ../development/libraries/sqlite-amalgamation { }; - sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; @@ -8912,9 +8949,13 @@ in inherit (pythonPackages) gyp; }; - vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { + libva = libva-full; # also wants libva-{x11,drm,wayland} + }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { + libva = libva-full; # needs libva-{x11,glx} + }; vamp = callPackage ../development/libraries/audio/vamp { }; @@ -8954,6 +8995,8 @@ in graphviz = graphviz-nox; }; + wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; + webkit = webkitgtk; wcslib = callPackage ../development/libraries/wcslib { }; @@ -8968,6 +9011,11 @@ in gst-plugins-base = gst_all_1.gst-plugins-base; }; + webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { + harfbuzz = harfbuzz-icu; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false; @@ -9178,6 +9226,8 @@ in jzmq = callPackage ../development/libraries/java/jzmq { }; + lombok = callPackage ../development/libraries/java/lombok { }; + lucene = callPackage ../development/libraries/java/lucene { }; lucenepp = callPackage ../development/libraries/lucene++ { @@ -9427,7 +9477,7 @@ in rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_4; + apacheHttpd = self.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -9467,7 +9517,7 @@ in cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { }; cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; - cassandra = cassandra_2_1; + cassandra = self.cassandra_2_1; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -9477,7 +9527,7 @@ in java = jdk; }; - fuseki = apache-jena-fuseki; + fuseki = self.apache-jena-fuseki; apcupsd = callPackage ../servers/apcupsd { }; @@ -9613,7 +9663,6 @@ in # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; - mod_evasive = pkgs.apacheHttpdPackages.mod_evasive; mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; @@ -9821,6 +9870,8 @@ in pumpio = callPackage ../servers/web-apps/pump.io { }; + pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; + pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; @@ -9960,6 +10011,8 @@ in zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; + xqilla = callPackage ../development/tools/xqilla { }; + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; @@ -10025,17 +10078,13 @@ in microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - apparmor = callPackage ../os-specific/linux/apparmor { swig = swig2; }; - libapparmor = apparmor.libapparmor; - apparmor-pam = apparmor.apparmor-pam; - apparmor-parser = apparmor.apparmor-parser; - apparmor-profiles = apparmor.apparmor-profiles; - apparmor-utils = apparmor.apparmor-utils; + inherit (callPackages ../os-specific/linux/apparmor { pythonPackages = python27Packages; swig = swig2; }) + libapparmor apparmor-pam apparmor-parser apparmor-profiles apparmor-utils; atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = audit; + libaudit = self.audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -10054,7 +10103,7 @@ in # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = bluez5; + bluez = self.bluez5; inherit (pythonPackages) bedup; @@ -10138,7 +10187,7 @@ in inherit (darwin) libobjc; }; - devicemapper = lvm2; + devicemapper = self.lvm2; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; @@ -10191,7 +10240,7 @@ in ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = utillinux; + eject = self.utillinux; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; @@ -10202,7 +10251,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; ffadoFull = callPackage ../os-specific/linux/ffado { }; - libffado = ffadoFull.override { prefix = "lib"; }; + libffado = self.ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -10226,7 +10275,7 @@ in ncurses = null; # Keep curses disabled for lack of value }; - gpm-ncurses = gpm.override { inherit ncurses; }; + gpm-ncurses = self.gpm.override { inherit ncurses; }; gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; @@ -10267,6 +10316,11 @@ in }; iptables = callPackage ../os-specific/linux/iptables { }; + # The freshest version — possibly crashing connmand? + # https://github.com/NixOS/nixpkgs/commit/fe00c8a83f696e3430ee4aa3fc850f171da52450 + iptables_16 = callPackage ../os-specific/linux/iptables/1.6.nix { + flex = flex_2_5_35; + }; ipset = callPackage ../os-specific/linux/ipset { }; @@ -10306,7 +10360,7 @@ in # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = linuxHeaders_3_18; + linuxHeaders = self.linuxHeaders_3_18; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { cross = assert crossSystem != null; crossSystem; @@ -10319,12 +10373,12 @@ in linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross - else if ver == "2.6" then linuxHeaders26Cross + linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross + else if ver == "2.6" then self.linuxHeaders26Cross else throw "Unknown linux kernel version"; linuxHeadersCross = assert crossSystem != null; - linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + self.linuxHeadersCrossChooser crossSystem.platform.kernelMajor; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -10396,7 +10450,7 @@ in }; linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -10437,7 +10491,7 @@ in ]; }; - linux_chromiumos_latest = linux_chromiumos_3_18; + linux_chromiumos_latest = self.linux_chromiumos_3_18; /* grsec configuration @@ -10488,36 +10542,36 @@ in grsecOptions = { kernelPatch = patch; } // opts; }); - grKernel = patch: opts: (mkGrsecurity patch opts).grsecKernel; - grPackage = patch: opts: recurseIntoAttrs (mkGrsecurity patch opts).grsecPackage; + grKernel = patch: opts: (self.mkGrsecurity patch opts).grsecKernel; + grPackage = patch: opts: recurseIntoAttrs (self.mkGrsecurity patch opts).grsecPackage; # grsecurity kernels (see also linuxPackages_grsec_*) - linux_grsec_desktop_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.desktop; - linux_grsec_server_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.server; - linux_grsec_server_xen_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.server_xen; + linux_grsec_desktop_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.desktop; + linux_grsec_server_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server; + linux_grsec_server_xen_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - linux_grsec_desktop_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.desktop; - linux_grsec_server_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.server; - linux_grsec_server_xen_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.server_xen; + linux_grsec_desktop_4_1 = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.desktop; + linux_grsec_server_4_1 = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.server; + linux_grsec_server_xen_4_1 = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.server_xen; - linux_grsec_desktop_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.desktop; - linux_grsec_server_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.server; - linux_grsec_server_xen_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.server_xen; + linux_grsec_desktop_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.desktop; + linux_grsec_server_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server; + linux_grsec_server_xen_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linux_grsec_desktop_latest = grKernel kernelPatches.grsecurity_latest grFlavors.desktop; - linux_grsec_server_latest = grKernel kernelPatches.grsecurity_latest grFlavors.server; - linux_grsec_server_xen_latest = grKernel kernelPatches.grsecurity_latest grFlavors.server_xen; + linux_grsec_desktop_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.desktop; + linux_grsec_server_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server; + linux_grsec_server_xen_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server_xen; # grsecurity: old names - linux_grsec_testing_desktop = linux_grsec_desktop_latest; - linux_grsec_testing_server = linux_grsec_server_latest; - linux_grsec_testing_server_xen = linux_grsec_server_xen_latest; + linux_grsec_testing_desktop = self.linux_grsec_desktop_latest; + linux_grsec_testing_server = self.linux_grsec_server_latest; + linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest; - linux_grsec_stable_desktop = linux_grsec_desktop_3_14; - linux_grsec_stable_server = linux_grsec_server_3_14; - linux_grsec_stable_server_xen = linux_grsec_server_xen_3_14; + linux_grsec_stable_desktop = self.linux_grsec_desktop_3_14; + linux_grsec_stable_server = self.linux_grsec_server_3_14; + linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -10637,67 +10691,67 @@ in }; # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_4; - linux = linuxPackages.kernel; + linuxPackages = self.linuxPackages_4_4; + linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_5; - linux_latest = linuxPackages_latest.kernel; + linuxPackages_latest = self.linuxPackages_4_5; + linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp linuxPackages_mptcp; - linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; - linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); - linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; - linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); - linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); - linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); - linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3); - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); - linuxPackages_4_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_5 linuxPackages_4_5); - linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); + linuxPackages_mptcp = self.linuxPackagesFor self.linux_mptcp linuxPackages_mptcp; + linuxPackages_rpi = self.linuxPackagesFor self.linux_rpi linuxPackages_rpi; + linuxPackages_3_10 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_10 linuxPackages_3_10); + linuxPackages_3_10_tuxonice = self.linuxPackagesFor self.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; + linuxPackages_3_12 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_12); + linuxPackages_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_14 linuxPackages_3_14); + linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); + linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); + linuxPackages_4_3 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_3 linuxPackages_4_3); + linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); + linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5); + linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: - let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; - allowImportFromDerivation=true;}) + let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; + allowImportFromDerivation=true;}) linuxPackages_self); in recurseIntoAttrs linuxPackages_self; # Build a kernel for Xen dom0 - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (self.linuxPackagesFor (self.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); # grsecurity packages - linuxPackages_grsec_desktop_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.desktop; - linuxPackages_grsec_server_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.server; - linuxPackages_grsec_server_xen_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.server_xen; + linuxPackages_grsec_desktop_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop; + linuxPackages_grsec_server_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server; + linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - linuxPackages_grsec_desktop_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.desktop; - linuxPackages_grsec_server_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.server; - linuxPackages_grsec_server_xen_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.server_xen; + linuxPackages_grsec_desktop_4_1 = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.desktop; + linuxPackages_grsec_server_4_1 = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.server; + linuxPackages_grsec_server_xen_4_1 = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.server_xen; - linuxPackages_grsec_desktop_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.desktop; - linuxPackages_grsec_server_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.server; - linuxPackages_grsec_server_xen_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.server_xen; + linuxPackages_grsec_desktop_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop; + linuxPackages_grsec_server_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server; + linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linuxPackages_grsec_desktop_latest = grPackage kernelPatches.grsecurity_latest grFlavors.desktop; - linuxPackages_grsec_server_latest = grPackage kernelPatches.grsecurity_latest grFlavors.server; - linuxPackages_grsec_server_xen_latest = grPackage kernelPatches.grsecurity_latest grFlavors.server_xen; + linuxPackages_grsec_desktop_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.desktop; + linuxPackages_grsec_server_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server; + linuxPackages_grsec_server_xen_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server_xen; # grsecurity: old names - linuxPackages_grsec_testing_desktop = linuxPackages_grsec_desktop_latest; - linuxPackages_grsec_testing_server = linuxPackages_grsec_server_latest; - linuxPackages_grsec_testing_server_xen = linuxPackages_grsec_server_xen_latest; + linuxPackages_grsec_testing_desktop = self.linuxPackages_grsec_desktop_latest; + linuxPackages_grsec_testing_server = self.linuxPackages_grsec_server_latest; + linuxPackages_grsec_testing_server_xen = self.linuxPackages_grsec_server_xen_latest; - linuxPackages_grsec_stable_desktop = linuxPackages_grsec_desktop_3_14; - linuxPackages_grsec_stable_server = linuxPackages_grsec_server_3_14; - linuxPackages_grsec_stable_server_xen = linuxPackages_grsec_server_xen_3_14; + linuxPackages_grsec_stable_desktop = self.linuxPackages_grsec_desktop_3_14; + linuxPackages_grsec_stable_server = self.linuxPackages_grsec_server_3_14; + linuxPackages_grsec_stable_server_xen = self.linuxPackages_grsec_server_xen_3_14; # ChromiumOS kernels - linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); - linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); - linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest); + linuxPackages_chromiumos_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); + linuxPackages_chromiumos_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); + linuxPackages_chromiumos_latest = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_latest linuxPackages_chromiumos_latest); # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; @@ -10939,8 +10993,8 @@ in }; # Provided with sysfsutils. - libsysfs = sysfsutils; - systool = sysfsutils; + libsysfs = self.sysfsutils; + systool = self.sysfsutils; sysklogd = callPackage ../os-specific/linux/sysklogd { }; @@ -10950,7 +11004,15 @@ in systemd = callPackage ../os-specific/linux/systemd { linuxHeaders = linuxHeaders_3_18; - }; + utillinux = utillinuxMinimal; # break the cyclic dependency + } + // { + udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm + udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.* + }; + + # standalone cryptsetup generator for systemd + systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. @@ -11004,7 +11066,11 @@ in cross = assert crossSystem != null; crossSystem; }); - udev = pkgs.systemd; + # This hacky alias covers most use cases without mass-replace (build inputs) + # and causes an *evaluation* error if "${udev}" is attempted. + udev = [ libudev.dev libudev.out ]; + libudev = callPackage ../os-specific/linux/systemd/libudev.nix { }; + eudev = callPackage ../os-specific/linux/eudev {}; # libudev.so.0 @@ -11196,9 +11262,9 @@ in docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = docbook_xsl; + docbook_xml_xslt = self.docbook_xsl; - docbook5_xsl = docbook_xsl_ns; + docbook5_xsl = self.docbook_xsl_ns; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; @@ -11236,6 +11302,8 @@ in hack-font = callPackage ../data/fonts/hack { }; + helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; hanazono = callPackage ../data/fonts/hanazono { }; @@ -11260,7 +11328,7 @@ in liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = liberation_ttf_binary; + liberation_ttf = self.liberation_ttf_binary; libertine = callPackage ../data/fonts/libertine { }; @@ -11325,6 +11393,8 @@ in powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; + profont = callPackage ../data/fonts/profont { }; + proggyfonts = callPackage ../data/fonts/proggyfonts { }; sampradaya = callPackage ../data/fonts/sampradaya { }; @@ -11499,7 +11569,7 @@ in antiword = callPackage ../applications/office/antiword {}; - ardour = ardour4; + ardour = self.ardour4; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; @@ -11538,8 +11608,8 @@ in altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { callPackage = newScope { boost = boost155; }; } ); - bitcoin = altcoins.bitcoin; - bitcoin-xt = altcoins.bitcoin-xt; + bitcoin = self.altcoins.bitcoin; + bitcoin-xt = self.altcoins.bitcoin-xt; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -11547,12 +11617,12 @@ in autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux_unwrapped = callPackage ../applications/video/avidemux { }; - - avidemux = callPackage ../applications/video/avidemux/wrapper.nix { - avidemux = avidemux_unwrapped; + avidemux_unwrapped = callPackage ../applications/video/avidemux { + libva = libva-full; # also wants libva-x11 }; + avidemux = callPackage ../applications/video/avidemux/wrapper.nix { }; + avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; }; @@ -11571,7 +11641,7 @@ in cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = awesome-3-5; + awesome = self.awesome-3-5; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; @@ -11581,7 +11651,7 @@ in backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; - backintime = backintime-qt4; + backintime = self.backintime-qt4; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -11687,7 +11757,7 @@ in cddiscid = callPackage ../applications/audio/cd-discid { }; - cdparanoia = cdparanoiaIII; + cdparanoia = self.cdparanoiaIII; cdparanoiaIII = callPackage ../applications/audio/cdparanoia { inherit (darwin) IOKit; @@ -11722,9 +11792,9 @@ in chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); + chromiumBeta = lowPrio (self.chromium.override { channel = "beta"; }); - chromiumDev = lowPrio (chromium.override { channel = "dev"; }); + chromiumDev = lowPrio (self.chromium.override { channel = "dev"; }); chuck = callPackage ../applications/audio/chuck { }; @@ -11782,7 +11852,7 @@ in comical = callPackage ../applications/graphics/comical { }; conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = wrapFirefox conkeror-unwrapped { }; + conkeror = self.wrapFirefox conkeror-unwrapped { }; csdp = callPackage ../applications/science/math/csdp { liblapack = liblapackWithoutAtlas; @@ -11813,7 +11883,7 @@ in d4x = callPackage ../applications/misc/d4x { }; - darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: { + darcs = haskell.lib.overrideCabal self.haskellPackages.darcs (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; enableSharedExecutables = false; enableSharedLibraries = false; @@ -11862,7 +11932,7 @@ in djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = callPackage ../applications/graphics/djview { }; - djview4 = pkgs.djview; + djview4 = self.djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -11870,10 +11940,9 @@ in dmenu2 = callPackage ../applications/misc/dmenu2 { }; - dmtx = dmtx-utils; + dmtx = self.dmtx-utils; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { - }; + dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; docker = callPackage ../applications/virtualization/docker { btrfs-progs = btrfs-progs_4_4_1; @@ -11925,10 +11994,10 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs24; - emacsPackages = emacs24Packages; - emacsPackagesNg = emacs24PackagesNg; - emacsMelpa = emacs24PackagesNg; # for backward compatibility + emacs = self.emacs24; + emacsPackages = self.emacs24Packages; + emacsPackagesNg = self.emacs24PackagesNg; + emacsMelpa = self.emacs24PackagesNg; # for backward compatibility emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features @@ -11942,7 +12011,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; - emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { + emacs24-nox = lowPrio (appendToName "nox" (self.emacs24.override { withX = false; withGTK2 = false; withGTK3 = false; @@ -12311,15 +12380,15 @@ in enableGTK3 = false; }) firefox-unwrapped firefox-esr-unwrapped; - firefox = wrapFirefox firefox-unwrapped { }; - firefox-esr = wrapFirefox firefox-esr-unwrapped { }; + firefox = self.wrapFirefox firefox-unwrapped { }; + firefox-esr = self.wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; }; - firefox-bin = wrapFirefox firefox-bin-unwrapped { + firefox-bin = self.wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; name = "firefox-bin-" + (builtins.parseDrvName firefox-bin-unwrapped.name).version; @@ -12336,9 +12405,9 @@ in debug = config.flashplayer.debug or false; }; - flashplayer-standalone = pkgsi686Linux.flashplayer.sa; + flashplayer-standalone = self.pkgsi686Linux.flashplayer.sa; - flashplayer-standalone-debugger = pkgsi686Linux.flashplayer.saDbg; + flashplayer-standalone-debugger = (self.pkgsi686Linux.flashplayer.override { debug = true; }).sa; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -12388,7 +12457,7 @@ in wrapPython = pythonPackages.wrapPython; }; - gimp = gimp_2_8; + gimp = self.gimp_2_8; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { gimp = gimp_2_8; @@ -12399,7 +12468,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; + inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -12418,9 +12487,7 @@ in inherit (gnome3) gitg; - giv = callPackage ../applications/graphics/giv { - pcre = pcre.override { unicodeSupport = true; }; - }; + giv = callPackage ../applications/graphics/giv { }; gmrun = callPackage ../applications/misc/gmrun {}; @@ -12537,9 +12604,9 @@ in google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; - google-chrome-beta = google-chrome.override { channel = "beta"; }; + google-chrome-beta = self.google-chrome.override { channel = "beta"; }; - google-chrome-dev = google-chrome.override { channel = "dev"; }; + google-chrome-dev = self.google-chrome.override { channel = "dev"; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; @@ -12667,7 +12734,7 @@ in inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; - imagemagick_light = imagemagick.override { + imagemagick_light = self.imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -12685,7 +12752,7 @@ in libxml2 = null; }; - imagemagick = imagemagickBig.override { + imagemagick = self.imagemagickBig.override { ghostscript = null; }; @@ -12730,6 +12797,8 @@ in bip = callPackage ../applications/networking/irc/bip { }; + j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop/default.nix { }; + jabref = callPackage ../applications/office/jabref/default.nix { }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -12741,7 +12810,7 @@ in jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; - jackmix_jack1 = jackmix.override { jack = jack1; }; + jackmix_jack1 = self.jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; @@ -12852,7 +12921,7 @@ in libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; @@ -12885,7 +12954,7 @@ in ledger3 = callPackage ../applications/office/ledger { boost = boost155; }; - ledger = ledger3; + ledger = self.ledger3; lighttable = callPackage ../applications/editors/lighttable {}; @@ -13131,6 +13200,8 @@ in mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { }; + neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; + notion = callPackage ../applications/window-managers/notion { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -13288,6 +13359,8 @@ in inherit (pkgs.kde4) kdelibs; }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + opusfile = callPackage ../applications/audio/opusfile { }; opusTools = callPackage ../applications/audio/opus-tools { }; @@ -13662,10 +13735,12 @@ in st = callPackage ../applications/misc/st { conf = config.st.conf or null; + patches = config.st.patches or null; }; st-wayland = callPackage ../applications/misc/st/wayland.nix { conf = config.st.conf or null; + patches = config.st.patches or null; }; stag = callPackage ../applications/misc/stag { @@ -13690,7 +13765,7 @@ in sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = bittorrentSync14; + bittorrentSync = self.bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; @@ -13705,7 +13780,7 @@ in withQt5 = false; }; - lightdm_qt = lightdm.override { withQt5 = true; }; + lightdm_qt = self.lightdm.override { withQt5 = true; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; @@ -14051,6 +14126,10 @@ in neovim-pygui = pythonPackages.neovim_gui; + vis = callPackage ../applications/editors/vis { + inherit (lua52Packages) lpeg; + }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; @@ -14101,6 +14180,7 @@ in vlc = callPackage ../applications/video/vlc { ffmpeg = ffmpeg_2; + libva = libva-full; # also wants libva-x11 }; vlc_qt5 = qt5.vlc; @@ -14272,23 +14352,23 @@ in }; kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = kodiPlain; + xbmcPlain = self.kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); - xbmcPlugins = kodiPlugins; + xbmcPlugins = self.kodiPlugins; - kodi = wrapKodi { + kodi = self.wrapKodi { kodi = kodiPlain; }; - xbmc = kodi; + xbmc = self.kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; + xbmc-retroarch-advanced-launchers = self.kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -14314,6 +14394,8 @@ in w3m = w3m-batch; }; + xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { }; + xdotool = callPackage ../tools/X11/xdotool { }; xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { stdenv = overrideCC stdenv gcc49; }; @@ -14580,16 +14662,16 @@ in freeglut = null; }); - construo = construoBase.override { + construo = self.construoBase.override { inherit mesa freeglut; }; crack_attack = callPackage ../games/crack-attack { }; crafty = callPackage ../games/crafty { }; - craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); + craftyFull = appendToName "full" (self.crafty.override { fullVariant = true; }); - crawlTiles = crawl.override { + crawlTiles = self.crawl.override { tileMode = true; }; @@ -14606,10 +14688,8 @@ in duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); - - dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; - - dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; + inherit (self.dwarf-fortress-packages) + dwarf-fortress dwarf-therapist; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -14629,7 +14709,9 @@ in exult = callPackage ../games/exult { }; - factorio = callPackage ../games/factorio {}; + factorio = callPackage ../games/factorio { releaseType = "alpha"; }; + + factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; fairymax = callPackage ../games/fairymax {}; @@ -14706,6 +14788,8 @@ in lgogdownloader = callPackage ../games/lgogdownloader { }; + liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; + lincity = callPackage ../games/lincity {}; lincity_ng = callPackage ../games/lincity/ng.nix {}; @@ -14824,6 +14908,13 @@ in openglSupport = mesaSupported; }; + rigsofrods = callPackage ../games/rigsofrods { + angelscript = angelscript_2_22; + mygui = mygui.override { + withOgre = true; + }; + }; + rili = callPackage ../games/rili { }; rimshot = callPackage ../games/rimshot { love = love_0_7; }; @@ -15061,15 +15152,15 @@ in gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); - gnome3 = gnome3_18; + gnome3 = self.gnome3_18; - gnome = recurseIntoAttrs gnome2; + gnome = recurseIntoAttrs self.gnome2; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs pkgs.kde414; + kde4 = recurseIntoAttrs self.kde414; kde414 = kdePackagesFor @@ -15447,6 +15538,8 @@ in plink = callPackage ../applications/science/biology/plink/default.nix { }; + samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + ### SCIENCE/MATH @@ -15462,7 +15555,7 @@ in withLapack = false; }; - atlasWithLapack = atlas.override { withLapack = true; }; + atlasWithLapack = self.atlas.override { withLapack = true; }; blas = callPackage ../development/libraries/science/math/blas { }; @@ -15474,11 +15567,11 @@ in # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; + liblapackWithoutAtlas = self.liblapackWithAtlas.override { atlas = null; }; liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = liblapackWithAtlas; - liblapack_3_5_0 = liblapack_3_5_0WithAtlas; + liblapack_3_5_0WithoutAtlas = self.liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = self.liblapackWithAtlas; + liblapack_3_5_0 = self.liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -15704,6 +15797,8 @@ in metis-prover = callPackage ../applications/science/logic/metis-prover { }; + mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; + minisat = callPackage ../applications/science/logic/minisat {}; opensmt = callPackage ../applications/science/logic/opensmt { }; @@ -15743,12 +15838,14 @@ in why3 = callPackage ../applications/science/logic/why3 {}; - yices = callPackage ../applications/science/logic/yices {}; + yices = callPackage ../applications/science/logic/yices { + gmp-static = gmp.override { withStatic = true; }; + }; z3 = callPackage ../applications/science/logic/z3 {}; z3_opt = callPackage ../applications/science/logic/z3_opt {}; - boolector = boolector15; + boolector = self.boolector15; boolector15 = callPackage ../applications/science/logic/boolector {}; boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { useV16 = true; @@ -15907,9 +16004,11 @@ in auctex = callPackage ../tools/typesetting/tex/auctex { }; + areca = callPackage ../applications/backup/areca { }; + beep = callPackage ../misc/beep { }; - brgenml1lpr = callPackage ../misc/cups/drivers/brgenml1lpr {}; + brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; @@ -15945,7 +16044,7 @@ in enableAllFeatures = false; }; - dblatexFull = appendToName "full" (dblatex.override { + dblatexFull = appendToName "full" (self.dblatex.override { enableAllFeatures = true; }); @@ -15961,7 +16060,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = faust2; + faust = self.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -16006,7 +16105,7 @@ in cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); }; - ghostscriptX = appendToName "with-X" (ghostscript.override { + ghostscriptX = appendToName "with-X" (self.ghostscript.override { x11Support = true; }); @@ -16022,11 +16121,11 @@ in hplip = callPackage ../misc/drivers/hplip { }; - hplipWithPlugin = hplip.override { withPlugin = true; }; + hplipWithPlugin = self.hplip.override { withPlugin = true; }; hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; - hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; + hplipWithPlugin_3_15_9 = self.hplip_3_15_9.override { withPlugin = true; }; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -16034,7 +16133,7 @@ in jack2Full = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; }; - libjack2 = jack2Full.override { prefix = "lib"; }; + libjack2 = self.jack2Full.override { prefix = "lib"; }; libjack2-git = callPackage ../misc/jackaudio/git.nix { }; keynav = callPackage ../tools/X11/keynav { }; @@ -16051,7 +16150,9 @@ in mongoc = callPackage ../development/libraries/mongoc { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../misc/emulators/mupen64plus { + stdenv = overrideCC stdenv gcc49; + }; inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; @@ -16317,7 +16418,7 @@ in }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - inherit (kde4) rekonq; + inherit (self.kde4) rekonq; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; @@ -16348,6 +16449,8 @@ in wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wraith = callPackage ../applications/networking/irc/wraith { }; + wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; x2x = callPackage ../tools/X11/x2x { }; @@ -16428,7 +16531,6 @@ in higan = callPackage ../misc/emulators/higan { inherit (gnome) gtksourceview; - profile = config.higan.profile or "balanced"; }; misc = callPackage ../misc/misc.nix { }; @@ -16444,4 +16546,6 @@ in togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = callPackage ../applications/networking/instant-messengers/discord { }; + + #golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; } diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1da324e5879eb..e68d8c4563e0a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -195,6 +195,16 @@ let buildInputs = [ gohtml ]; }; + acme = buildFromGitHub { + rev = "v0.3.0"; + owner = "xenolf"; + repo = "lego"; + sha256 = "0hlnqdn793j4s43bhnmpi2lxgmjxs1ccg26alxnrcyw5x7p2vvdn"; + + subPackages = [ "acme" ]; + propagatedBuildInputs = [ crypto dns go-jose-v1 net ]; + }; + adapted = buildFromGitHub { rev = "eaea06aaff855227a71b1c58b18bc6de822e3e77"; version = "2015-06-03"; @@ -401,6 +411,19 @@ let propagatedBuildInputs = [ panicwrap revel ]; }; + caddy = buildFromGitHub { + rev = "9099375b11b7b5e62b831627c2927d1c4c666071"; + version = "v0.8.2"; + owner = "mholt"; + repo = "caddy"; + sha256 = "1zdy2sxir21ngh2ird01sv4fgj6sy3wl4s6k4piklri8ps1zw0k0"; + buildInputs = [ + acme blackfriday crypto go-humanize go-shlex go-syslog + http-authentication lumberjack-v2 toml websocket yaml-v2 + ]; + disabled = isGo14 || isGo15; + }; + cascadia = buildGoPackage rec { rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}"; @@ -468,10 +491,11 @@ let }; cli-go = buildFromGitHub { - rev = "142e6cd241a4dfbf7f07a018f1f8225180018da4"; + rev = "71f57d300dd6a780ac1856c005c4b518cfd498ec"; owner = "codegangsta"; repo = "cli"; - sha256 = "1w8naax4gvkkxw5h31a2c2dwniw5hj92nv0hn6ybdlavffyax9h5"; + sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"; + propagatedBuildInputs = [ yaml-v2 ]; }; columnize = buildFromGitHub { @@ -661,11 +685,11 @@ let }; dns = buildFromGitHub { - rev = "e59f851c912767b1db587dcabee6e6652e495c75"; - version = "2015-07-22"; - owner = "miekg"; - repo = "dns"; - sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + version = "2016-03-28"; + owner = "miekg"; + repo = "dns"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; }; docopt-go = buildFromGitHub { @@ -675,6 +699,24 @@ let sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1"; }; + docker.docker = buildFromGitHub { + rev = "cb87b6eb6a955e5a66b17e0a15557f37f76b85c0"; + version = "2016-04-14"; + owner = "docker"; + repo = "docker"; + sha256 = "1hkah4scs8a589jhp82kw5wcx21nhq41asfq8icwy6bzdz1bq0j0"; + buildInputs = [ docker.go-units ]; + subPackages = [ "pkg/term" "pkg/symlink" "pkg/system" "pkg/mount" ]; + }; + + docker.go-units = buildFromGitHub { + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + version = "2016-01-25"; + owner = "docker"; + repo = "go-units"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + drive = buildFromGitHub { rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544"; owner = "odeke-em"; @@ -902,6 +944,32 @@ let sha256 = "1iz4wjxc3zkj0xkfs88ig670gb08p1sd922l0ig2cxpjcfjp1y99"; }; + gojsonpointer = buildFromGitHub { + rev = "e0fe6f68307607d540ed8eac07a342c33fa1b54a"; + version = "2015-11-27"; + owner = "xeipuuv"; + repo = "gojsonpointer"; + sha256 = "0yfbisaas3w3ygh0cvb82mj6c1f8adqmnwmyid8l5p12r55531f8"; + }; + + gojsonreference = buildFromGitHub { + rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; + version = "2015-08-08"; + owner = "xeipuuv"; + repo = "gojsonreference"; + sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; + propagatedBuildInputs = [ gojsonpointer ]; + }; + + gojsonschema = buildFromGitHub { + rev = "93e72a773fade158921402d6a24c819b48aba29d"; + version = "2016-03-23"; + owner = "xeipuuv"; + repo = "gojsonschema"; + sha256 = "0hqpcy4xgm9xw16dxbs1skrh6ga60bwfjv5dyz5zh86xsxpln3nr"; + propagatedBuildInputs = [ gojsonreference ]; + }; + gosexy.gettext = buildFromGitHub { rev = "4a979356fe964fec12e18326a32a89661f93dea7"; version = "2016-02-20"; @@ -1289,6 +1357,14 @@ let sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; }; + gosu = buildFromGitHub { + rev = "1.7"; + owner = "tianon"; + repo = "gosu"; + sha256 = "02vln88yyhj8k8cyzac0sgw84626vshmzdrrc1jpl4k4sc27vcbp"; + buildInputs = [ opencontainers.runc ]; + }; + gox = buildGoPackage rec { rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549"; name = "gox-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1561,6 +1637,16 @@ let sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; }; + go-jose-v1 = buildFromGitHub { + rev = "v1.0.1"; + owner = "square"; + repo = "go-jose"; + sha256 = "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"; + propagatedBuildInputs = [ cli-go ]; + goPackagePath = "gopkg.in/square/go-jose.v1"; + goPackageAliases = [ "github.com/square/go-jose" ]; + }; + go-liblzma = buildFromGitHub { rev = "e74be71c3c60411922b5424e875d7692ea638b78"; version = "2016-01-01"; @@ -1702,6 +1788,20 @@ let }; }; + jp = buildFromGitHub { + rev = "0.1.2"; + owner = "jmespath"; + repo = "jp"; + sha256 = "1i0jl0c062crigkxqx8zpyqliz8j4d37y95cna33jl777kx42r6h"; + meta = with stdenv.lib; { + description = "A command line to JMESPath, an expression language for manipulating JSON"; + license = licenses.asl20; + homepage = http://jmespath.org; + maintainers = with maintainers; [ cransom ]; + platforms = platforms.unix; + }; + }; + mattn.go-runewidth = buildFromGitHub { rev = "d6bea18f789704b5f83375793155289da36a3c7f"; version = "2016-03-15"; @@ -1770,6 +1870,13 @@ let }; }; + go-shlex = buildFromGitHub { + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + owner = "flynn"; + repo = "go-shlex"; + sha256 = "2a6a6f8eb150260cd60881ec5f027b7d1d2946ee22c627b450773eaf3d1de4c8"; + }; + go-simplejson = buildFromGitHub { rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; version = "2015-03-31"; @@ -1816,7 +1923,7 @@ let repo = "go-systemd"; sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; nativeBuildInputs = [ pkgs.pkgconfig pkgs.systemd ]; - buildInputs = [ dbus ]; + propagatedBuildInputs = [ dbus ]; }; go-update-v0 = buildFromGitHub { @@ -1983,7 +2090,7 @@ let }; hologram = buildGoPackage rec { - rev = "63014b81675e1228818bf36ef6ef0028bacad24b"; + rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; @@ -1991,9 +2098,16 @@ let inherit rev; owner = "AdRoll"; repo = "hologram"; - sha256 = "0k8g7dwrkxdvmzs4aa8zz39qa8r2danc4x40hrblcgjhfcwzxrzr"; + sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox gopass ]; + }; + + http-authentication = buildFromGitHub { + rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; + owner = "jimstudt"; + repo = "http-authentication"; + sha256 = "08601600811a172d7f806b541f05691e4bef812ed8a68f7de65fde9ee11a3cb7"; }; http2 = buildFromGitHub rec { @@ -2242,6 +2356,16 @@ let sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; }; + lumberjack-v2 = buildFromGitHub { + rev = "v2.0"; + owner = "natefinch"; + repo = "lumberjack"; + sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + goPackageAliases = [ "github.com/natefinch/lumberjack" ]; + }; + + lxd = buildFromGitHub { rev = "lxd-2.0.0.rc4"; owner = "lxc"; @@ -2480,6 +2604,14 @@ let propagatedBuildInputs = [ ugorji.go ]; }; + netlink = buildFromGitHub { + rev = "a632d6dc2806fa19d2f7693017d3fb79d3d8fa03"; + version = "2016-04-05"; + owner = "vishvananda"; + repo = "netlink"; + sha256 = "1m1aanxlsb1zqqxmdi528ma8c5k2h0hp6vk2nmplm6rldcnvyr4v"; + }; + ngrok = buildFromGitHub { rev = "1.7.1"; owner = "inconshreveable"; @@ -2592,11 +2724,11 @@ let }; oh = buildFromGitHub { - rev = "f54be52450a07398a2f605222eb22e69bb34f565"; - version = "2016-03-02"; + rev = "22d91b0ea97f817cd5cccd90549f74923a57daa4"; + version = "2016-03-28"; owner = "michaelmacinnis"; repo = "oh"; - sha256 = "0gczqi9aw6sv7vmjdandxmaz1m6pfzchmbkf12qmpmc6dmh2wy6b"; + sha256 = "1dkw3c0d640g7ciw0mmbdq94zyykdcfada05m5amnqymknphmdvl"; goPackageAliases = [ "github.com/michaelmacinnis/oh" ]; buildInputs = [ adapted liner ]; disabled = isGo14; @@ -2629,6 +2761,27 @@ let propagatedBuildInputs = [ spacelog ]; }; + opencontainers.runtime-spec = buildFromGitHub { + rev = "53f0da5e98284a39b3aaa04d5be6730924380686"; + version = "2016-04-14"; + owner = "opencontainers"; + repo = "runtime-spec"; + sha256 = "1vxhbp8rcws4kix1v0pmrbg4x1k7zmsyq1an9526q4jdrdckp7kb"; + propagatedBuildInputs = [ gojsonschema ]; + }; + + opencontainers.runc = buildFromGitHub { + rev = "d1e00150320329da347de8ec830618c697c3df79"; + version = "2016-04-14"; + owner = "opencontainers"; + repo = "runc"; + sha256 = "18dhbb1d25s4cpikrari2ws3w7x92r6yxj4si64h9y177wmn6kml"; + propagatedBuildInputs = [ + go-systemd opencontainers.runtime-spec protobuf gocapability + docker.go-units logrus docker.docker netlink cli-go + ]; + }; + opsgenie-go-sdk = buildFromGitHub { rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; version = "2015-08-24"; @@ -3410,10 +3563,10 @@ let }; skydns = buildFromGitHub { - rev = "2.5.2b"; + rev = "2.5.3a"; owner = "skynetservices"; repo = "skydns"; - sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv"; + sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; buildInputs = [ go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang @@ -3499,11 +3652,11 @@ let }; syncthing = buildFromGitHub rec { - version = "0.12.19"; + version = "0.12.22"; rev = "v${version}"; owner = "syncthing"; repo = "syncthing"; - sha256 = "11ij8whaqrrzriavxa08jpsmbd1zkc2qxsni1nbgszw2hymmv38g"; + sha256 = "1pycmb5cwkp21p11rj6lbrqr66yiffi23zk5laas3p581ljdg5vj"; buildFlags = [ "-tags noupgrade,release" ]; disabled = isGo14; buildInputs = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ce8e68b5b7704..766c57cc5777c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -380,7 +380,10 @@ rec { lts-5_11 = packages.ghc7103.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.11.nix { }; }; - lts-5 = packages.lts-5_11; + lts-5_12 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.12.nix { }; + }; + lts-5 = packages.lts-5_12; lts = packages.lts-5; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e58df1f42c33f..abd4a81234162 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -103,7 +103,7 @@ let makeFlagsArray=( LUA_LDIR="$out/share/lua/${lua.luaversion}" LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}" - EXPAT_INC="-I${expat}/include"); + EXPAT_INC="-I${expat.dev}/include"); ''; meta = { diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b8f0e66dd5329..229461b82f7cb 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -565,8 +565,6 @@ }; by-spec."adm-zip"."~0.4.3" = self.by-version."adm-zip"."0.4.7"; - by-spec."adm-zip"."~0.4.7" = - self.by-version."adm-zip"."0.4.7"; by-spec."after"."0.8.1" = self.by-version."after"."0.8.1"; by-version."after"."0.8.1" = self.buildNodePackage { @@ -2003,15 +2001,15 @@ cpu = [ ]; }; by-spec."async"."*" = - self.by-version."async"."2.0.0-rc.2"; - by-version."async"."2.0.0-rc.2" = self.buildNodePackage { - name = "async-2.0.0-rc.2"; - version = "2.0.0-rc.2"; + self.by-version."async"."2.0.0-rc.3"; + by-version."async"."2.0.0-rc.3" = self.buildNodePackage { + name = "async-2.0.0-rc.3"; + version = "2.0.0-rc.3"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.2.tgz"; - name = "async-2.0.0-rc.2.tgz"; - sha1 = "6fc56eec72574ebfe43ad30aefef6206f1ad2494"; + url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.3.tgz"; + name = "async-2.0.0-rc.3.tgz"; + sha1 = "1fae1160594dd47dbe5431d4726d66b10f374d89"; }; deps = { "lodash-4.8.2" = self.by-version."lodash"."4.8.2"; @@ -2022,7 +2020,7 @@ os = [ ]; cpu = [ ]; }; - "async" = self.by-version."async"."2.0.0-rc.2"; + "async" = self.by-version."async"."2.0.0-rc.3"; by-spec."async"."0.1.18" = self.by-version."async"."0.1.18"; by-version."async"."0.1.18" = self.buildNodePackage { @@ -2310,15 +2308,15 @@ cpu = [ ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.3.0"; - by-version."aws-sdk"."2.3.0" = self.buildNodePackage { - name = "aws-sdk-2.3.0"; - version = "2.3.0"; + self.by-version."aws-sdk"."2.3.2"; + by-version."aws-sdk"."2.3.2" = self.buildNodePackage { + name = "aws-sdk-2.3.2"; + version = "2.3.2"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.0.tgz"; - name = "aws-sdk-2.3.0.tgz"; - sha1 = "96c653063863e2b7df34f6ab160f89f9c90b6a7b"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.2.tgz"; + name = "aws-sdk-2.3.2.tgz"; + sha1 = "2025fb6cfd40b077befb783b8de57d0c09a92575"; }; deps = { "sax-1.1.5" = self.by-version."sax"."1.1.5"; @@ -2332,7 +2330,7 @@ os = [ ]; cpu = [ ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.3.0"; + "aws-sdk" = self.by-version."aws-sdk"."2.3.2"; by-spec."aws-sdk"."2.0.5" = self.by-version."aws-sdk"."2.0.5"; by-version."aws-sdk"."2.0.5" = self.buildNodePackage { @@ -2356,7 +2354,7 @@ cpu = [ ]; }; by-spec."aws-sdk"."2.x" = - self.by-version."aws-sdk"."2.3.0"; + self.by-version."aws-sdk"."2.3.2"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = self.buildNodePackage { @@ -2379,9 +2377,9 @@ cpu = [ ]; }; by-spec."aws-sdk".">=2.0.0 >=2.2.43 <3.0.0" = - self.by-version."aws-sdk"."2.3.0"; + self.by-version."aws-sdk"."2.3.2"; by-spec."aws-sdk"."^2.2.43" = - self.by-version."aws-sdk"."2.3.0"; + self.by-version."aws-sdk"."2.3.2"; by-spec."aws-sdk-apis"."3.x" = self.by-version."aws-sdk-apis"."3.1.10"; by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage { @@ -2538,15 +2536,15 @@ cpu = [ ]; }; by-spec."backbone"."*" = - self.by-version."backbone"."1.3.2"; - by-version."backbone"."1.3.2" = self.buildNodePackage { - name = "backbone-1.3.2"; - version = "1.3.2"; + self.by-version."backbone"."1.3.3"; + by-version."backbone"."1.3.3" = self.buildNodePackage { + name = "backbone-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/backbone/-/backbone-1.3.2.tgz"; - name = "backbone-1.3.2.tgz"; - sha1 = "43cdf6b25af3f54a7deb314129e1397ff42d6b83"; + url = "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz"; + name = "backbone-1.3.3.tgz"; + sha1 = "4cc80ea7cb1631ac474889ce40f2f8bc683b2999"; }; deps = { "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; @@ -2557,7 +2555,7 @@ os = [ ]; cpu = [ ]; }; - "backbone" = self.by-version."backbone"."1.3.2"; + "backbone" = self.by-version."backbone"."1.3.3"; by-spec."backo2"."1.0.2" = self.by-version."backo2"."1.0.2"; by-version."backo2"."1.0.2" = self.buildNodePackage { @@ -2654,25 +2652,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."base62"."0.1.1" = - self.by-version."base62"."0.1.1"; - by-version."base62"."0.1.1" = self.buildNodePackage { - name = "base62-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; - name = "base62-0.1.1.tgz"; - sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."base62"."^1.1.0" = self.by-version."base62"."1.1.0"; by-version."base62"."1.1.0" = self.buildNodePackage { @@ -3169,15 +3148,15 @@ cpu = [ ]; }; by-spec."big-integer"."^1.6.7" = - self.by-version."big-integer"."1.6.14"; - by-version."big-integer"."1.6.14" = self.buildNodePackage { - name = "big-integer-1.6.14"; - version = "1.6.14"; + self.by-version."big-integer"."1.6.15"; + by-version."big-integer"."1.6.15" = self.buildNodePackage { + name = "big-integer-1.6.15"; + version = "1.6.15"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.14.tgz"; - name = "big-integer-1.6.14.tgz"; - sha1 = "8f6f03d7d6cce2917d8d5d81420f41fbaaeecd06"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; + name = "big-integer-1.6.15.tgz"; + sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; }; deps = { }; @@ -3870,7 +3849,7 @@ }; deps = { "passport-mailchimp-1.0.0" = self.by-version."passport-mailchimp"."1.0.0"; - "mailchimp-1.1.5" = self.by-version."mailchimp"."1.1.5"; + "mailchimp-1.1.6" = self.by-version."mailchimp"."1.1.6"; }; optionalDependencies = { }; @@ -5238,7 +5217,7 @@ sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; deps = { - "big-integer-1.6.14" = self.by-version."big-integer"."1.6.14"; + "big-integer-1.6.15" = self.by-version."big-integer"."1.6.15"; }; optionalDependencies = { }; @@ -5940,15 +5919,15 @@ cpu = [ ]; }; by-spec."bson"."~0.4.18" = - self.by-version."bson"."0.4.22"; - by-version."bson"."0.4.22" = self.buildNodePackage { - name = "bson-0.4.22"; - version = "0.4.22"; + self.by-version."bson"."0.4.23"; + by-version."bson"."0.4.23" = self.buildNodePackage { + name = "bson-0.4.23"; + version = "0.4.23"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.4.22.tgz"; - name = "bson-0.4.22.tgz"; - sha1 = "3dee54807286363bdf921c22de54e8d920a052d1"; + url = "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz"; + name = "bson-0.4.23.tgz"; + sha1 = "e65a2e3c7507ffade4109bc7575a76e50f8da915"; }; deps = { }; @@ -5959,11 +5938,11 @@ cpu = [ ]; }; by-spec."bson"."~0.4.19" = - self.by-version."bson"."0.4.22"; + self.by-version."bson"."0.4.23"; by-spec."bson"."~0.4.20" = - self.by-version."bson"."0.4.22"; + self.by-version."bson"."0.4.23"; by-spec."bson"."~0.4.21" = - self.by-version."bson"."0.4.22"; + self.by-version."bson"."0.4.23"; by-spec."buffer"."^3.0.0" = self.by-version."buffer"."3.6.0"; by-version."buffer"."3.6.0" = self.buildNodePackage { @@ -7190,25 +7169,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."charenc"."~ 0.0.1" = - self.by-version."charenc"."0.0.1"; - by-version."charenc"."0.0.1" = self.buildNodePackage { - name = "charenc-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz"; - name = "charenc-0.0.1.tgz"; - sha1 = "004cff9feaf102382ed12db58dd6f962796d6e88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."cheerio"."0.19.0" = self.by-version."cheerio"."0.19.0"; by-version."cheerio"."0.19.0" = self.buildNodePackage { @@ -9331,7 +9291,7 @@ }; deps = { "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4"; - "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14"; + "mongodb-2.1.16" = self.by-version."mongodb"."2.1.16"; }; optionalDependencies = { }; @@ -10231,15 +10191,15 @@ cpu = [ ]; }; by-spec."core-js"."^2.1.0" = - self.by-version."core-js"."2.2.1"; - by-version."core-js"."2.2.1" = self.buildNodePackage { - name = "core-js-2.2.1"; - version = "2.2.1"; + self.by-version."core-js"."2.2.2"; + by-version."core-js"."2.2.2" = self.buildNodePackage { + name = "core-js-2.2.2"; + version = "2.2.2"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.2.1.tgz"; - name = "core-js-2.2.1.tgz"; - sha1 = "e809840c0650ccae87209b4b2f13ed2d2f9e4005"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.2.2.tgz"; + name = "core-js-2.2.2.tgz"; + sha1 = "79a0f3a9495507641a5bf7ce275fa494649180bf"; }; deps = { }; @@ -10547,25 +10507,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."crypt"."~ 0.0.1" = - self.by-version."crypt"."0.0.1"; - by-version."crypt"."0.0.1" = self.buildNodePackage { - name = "crypt-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz"; - name = "crypt-0.0.1.tgz"; - sha1 = "5f11b21a6c05ef1b5e79708366da6374ece1e6a2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."crypt3".">=0.1.5 <1.0.0-0" = self.by-version."crypt3"."0.2.0"; by-version."crypt3"."0.2.0" = self.buildNodePackage { @@ -11715,7 +11656,7 @@ }; by-spec."deep-extend"."~0.4.0" = self.by-version."deep-extend"."0.4.1"; - by-spec."deep-is"."~0.1.2" = + by-spec."deep-is"."~0.1.3" = self.by-version."deep-is"."0.1.3"; by-version."deep-is"."0.1.3" = self.buildNodePackage { name = "deep-is-0.1.3"; @@ -11734,8 +11675,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."deep-is"."~0.1.3" = - self.by-version."deep-is"."0.1.3"; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.10"; by-version."deepmerge"."0.2.10" = self.buildNodePackage { @@ -12619,7 +12558,7 @@ "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2"; "split2-0.2.1" = self.by-version."split2"."0.2.1"; "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1"; - "tar-stream-1.4.0" = self.by-version."tar-stream"."1.4.0"; + "tar-stream-1.5.1" = self.by-version."tar-stream"."1.5.1"; "through2-0.6.5" = self.by-version."through2"."0.6.5"; "thunky-0.1.0" = self.by-version."thunky"."0.1.0"; "xtend-4.0.1" = self.by-version."xtend"."4.0.1"; @@ -12823,15 +12762,15 @@ by-spec."domhandler"."^2.3.0" = self.by-version."domhandler"."2.3.0"; by-spec."domino"."~1.0.19" = - self.by-version."domino"."1.0.23"; - by-version."domino"."1.0.23" = self.buildNodePackage { - name = "domino-1.0.23"; - version = "1.0.23"; + self.by-version."domino"."1.0.24"; + by-version."domino"."1.0.24" = self.buildNodePackage { + name = "domino-1.0.24"; + version = "1.0.24"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.23.tgz"; - name = "domino-1.0.23.tgz"; - sha1 = "6f251b0ba3e21a8b4bd1ecbaef01b23f963a512b"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.24.tgz"; + name = "domino-1.0.24.tgz"; + sha1 = "a3fab865851197f22943d3a1ec0f507e1ff008e1"; }; deps = { }; @@ -13664,6 +13603,28 @@ os = [ ]; cpu = [ ]; }; + by-spec."enhanced-resolve"."^0.9.1" = + self.by-version."enhanced-resolve"."0.9.1"; + by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage { + name = "enhanced-resolve-0.9.1"; + version = "0.9.1"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; + name = "enhanced-resolve-0.9.1.tgz"; + sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + }; + deps = { + "tapable-0.1.10" = self.by-version."tapable"."0.1.10"; + "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0"; + "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."enhanced-resolve"."^2.2.0" = self.by-version."enhanced-resolve"."2.2.2"; by-version."enhanced-resolve"."2.2.2" = self.buildNodePackage { @@ -13689,26 +13650,6 @@ }; by-spec."enhanced-resolve"."~0.9.0" = self.by-version."enhanced-resolve"."0.9.1"; - by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage { - name = "enhanced-resolve-0.9.1"; - version = "0.9.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - name = "enhanced-resolve-0.9.1.tgz"; - sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; - }; - deps = { - "tapable-0.1.10" = self.by-version."tapable"."0.1.10"; - "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0"; - "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."ent"."~2.2.0" = self.by-version."ent"."2.2.0"; by-version."ent"."2.2.0" = self.buildNodePackage { @@ -13768,27 +13709,6 @@ }; by-spec."entities"."~1.1.1" = self.by-version."entities"."1.1.1"; - by-spec."envify"."^3.0.0" = - self.by-version."envify"."3.4.0"; - by-version."envify"."3.4.0" = self.buildNodePackage { - name = "envify-3.4.0"; - version = "3.4.0"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz"; - name = "envify-3.4.0.tgz"; - sha1 = "a0bed52222529076a02fabf6ce00eef42d7b6734"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."errno"."^0.1.1" = self.by-version."errno"."0.1.4"; by-version."errno"."0.1.4" = self.buildNodePackage { @@ -14321,31 +14241,7 @@ }; by-spec."escape-string-regexp"."^1.0.2" = self.by-version."escape-string-regexp"."1.0.5"; - by-spec."escodegen"."1.7.x" = - self.by-version."escodegen"."1.7.1"; - by-version."escodegen"."1.7.1" = self.buildNodePackage { - name = "escodegen-1.7.1"; - version = "1.7.1"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz"; - name = "escodegen-1.7.1.tgz"; - sha1 = "30ecfcf66ca98dc67cd2fd162abeb6eafa8ce6fc"; - }; - deps = { - "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3"; - "esutils-2.0.2" = self.by-version."esutils"."2.0.2"; - "esprima-1.2.5" = self.by-version."esprima"."1.2.5"; - "optionator-0.5.0" = self.by-version."optionator"."0.5.0"; - }; - optionalDependencies = { - "source-map-0.2.0" = self.by-version."source-map"."0.2.0"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escodegen"."^1.6.1" = + by-spec."escodegen"."1.8.x" = self.by-version."escodegen"."1.8.0"; by-version."escodegen"."1.8.0" = self.buildNodePackage { name = "escodegen-1.8.0"; @@ -14369,6 +14265,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."escodegen"."^1.6.1" = + self.by-version."escodegen"."1.8.0"; by-spec."escodegen"."^1.8.0" = self.by-version."escodegen"."1.8.0"; by-spec."escodegen"."~1.3.1" = @@ -14440,7 +14338,7 @@ "esutils-2.0.2" = self.by-version."esutils"."2.0.2"; "file-entry-cache-1.2.4" = self.by-version."file-entry-cache"."1.2.4"; "glob-7.0.3" = self.by-version."glob"."7.0.3"; - "globals-9.3.0" = self.by-version."globals"."9.3.0"; + "globals-9.4.0" = self.by-version."globals"."9.4.0"; "ignore-3.0.14" = self.by-version."ignore"."3.0.14"; "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4"; "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0"; @@ -14511,25 +14409,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."esprima"."^1.2.2" = - self.by-version."esprima"."1.2.5"; - by-version."esprima"."1.2.5" = self.buildNodePackage { - name = "esprima-1.2.5"; - version = "1.2.5"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"; - name = "esprima-1.2.5.tgz"; - sha1 = "0993502feaf668138325756f30f9a51feeec11e9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."esprima"."^2.5.0" = self.by-version."esprima"."2.7.2"; by-spec."esprima"."^2.6.0" = @@ -14595,25 +14474,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" = - self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb"; - by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage { - name = "esprima-fb-13001.1001.0-dev-harmony-fb"; - version = "13001.1001.0-dev-harmony-fb"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; - name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; - sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."esprima-fb"."^15001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb"; by-version."esprima-fb"."15001.1.0-dev-harmony-fb" = self.buildNodePackage { @@ -16072,7 +15932,7 @@ }; deps = { "chalk-1.1.3" = self.by-version."chalk"."1.1.3"; - "time-stamp-1.0.0" = self.by-version."time-stamp"."1.0.0"; + "time-stamp-1.0.1" = self.by-version."time-stamp"."1.0.1"; }; optionalDependencies = { }; @@ -16137,25 +15997,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."fast-levenshtein"."~1.0.0" = - self.by-version."fast-levenshtein"."1.0.7"; - by-version."fast-levenshtein"."1.0.7" = self.buildNodePackage { - name = "fast-levenshtein-1.0.7"; - version = "1.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; - name = "fast-levenshtein-1.0.7.tgz"; - sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."favitest"."^1.0.3" = self.by-version."favitest"."1.0.7"; by-version."favitest"."1.0.7" = self.buildNodePackage { @@ -16244,7 +16085,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."fbjs"."^0.8.0-alpha.2" = + by-spec."fbjs"."^0.8.0" = self.by-version."fbjs"."0.8.0"; by-version."fbjs"."0.8.0" = self.buildNodePackage { name = "fbjs-0.8.0"; @@ -17781,7 +17622,7 @@ sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335"; }; deps = { - "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2"; + "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3"; }; optionalDependencies = { }; @@ -17869,7 +17710,7 @@ }; deps = { "nan-2.2.1" = self.by-version."nan"."2.2.1"; - "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25"; + "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26"; }; optionalDependencies = { }; @@ -18424,6 +18265,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."glob"."3" = + self.by-version."glob"."3.2.11"; + by-version."glob"."3.2.11" = self.buildNodePackage { + name = "glob-3.2.11"; + version = "3.2.11"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + name = "glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."glob"."3 || 4" = self.by-version."glob"."4.5.3"; by-version."glob"."4.5.3" = self.buildNodePackage { @@ -18471,25 +18333,6 @@ }; by-spec."glob"."3.2.x" = self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = self.buildNodePackage { - name = "glob-3.2.11"; - version = "3.2.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."glob"."5.x" = self.by-version."glob"."5.0.15"; by-version."glob"."5.0.15" = self.buildNodePackage { @@ -18790,15 +18633,15 @@ cpu = [ ]; }; by-spec."globals"."^9.2.0" = - self.by-version."globals"."9.3.0"; - by-version."globals"."9.3.0" = self.buildNodePackage { - name = "globals-9.3.0"; - version = "9.3.0"; + self.by-version."globals"."9.4.0"; + by-version."globals"."9.4.0" = self.buildNodePackage { + name = "globals-9.4.0"; + version = "9.4.0"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.3.0.tgz"; - name = "globals-9.3.0.tgz"; - sha1 = "55a541cf8519d66055ed3c892dd7c49c1504783e"; + url = "https://registry.npmjs.org/globals/-/globals-9.4.0.tgz"; + name = "globals-9.4.0.tgz"; + sha1 = "e89906bbd58b40305e5691ef934324e93325b35f"; }; deps = { }; @@ -19227,15 +19070,15 @@ cpu = [ ]; }; by-spec."grunt".">=0.4.0" = - self.by-version."grunt"."1.0.0"; - by-version."grunt"."1.0.0" = self.buildNodePackage { - name = "grunt-1.0.0"; - version = "1.0.0"; + self.by-version."grunt"."1.0.1"; + by-version."grunt"."1.0.1" = self.buildNodePackage { + name = "grunt-1.0.1"; + version = "1.0.1"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/grunt/-/grunt-1.0.0.tgz"; - name = "grunt-1.0.0.tgz"; - sha1 = "5fea0f9f40afe65ca1ca61e40031891d325d4b43"; + url = "https://registry.npmjs.org/grunt/-/grunt-1.0.1.tgz"; + name = "grunt-1.0.1.tgz"; + sha1 = "e8778764e944b18f32bb0f10b9078475c9dfb56b"; }; deps = { "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0"; @@ -19262,7 +19105,7 @@ cpu = [ ]; }; by-spec."grunt".">=0.4.x" = - self.by-version."grunt"."1.0.0"; + self.by-version."grunt"."1.0.1"; by-spec."grunt"."~0.4" = self.by-version."grunt"."0.4.5"; by-version."grunt"."0.4.5" = self.buildNodePackage { @@ -19326,7 +19169,7 @@ cpu = [ ]; }; "grunt-cli" = self.by-version."grunt-cli"."1.2.0"; - by-spec."grunt-cli"."1.2.0" = + by-spec."grunt-cli"."~1.2.0" = self.by-version."grunt-cli"."1.2.0"; by-spec."grunt-contrib-cssmin"."*" = self.by-version."grunt-contrib-cssmin"."1.0.1"; @@ -19368,7 +19211,7 @@ optionalDependencies = { }; peerDependencies = [ - self.by-version."grunt"."1.0.0"]; + self.by-version."grunt"."1.0.1"]; os = [ ]; cpu = [ ]; }; @@ -19392,7 +19235,7 @@ optionalDependencies = { }; peerDependencies = [ - self.by-version."grunt"."1.0.0"]; + self.by-version."grunt"."1.0.1"]; os = [ ]; cpu = [ ]; }; @@ -19484,7 +19327,7 @@ optionalDependencies = { }; peerDependencies = [ - self.by-version."grunt"."1.0.0" + self.by-version."grunt"."1.0.1" self.by-version."karma"."0.13.22"]; os = [ ]; cpu = [ ]; @@ -19973,15 +19816,15 @@ by-spec."har-validator"."~2.0.6" = self.by-version."har-validator"."2.0.6"; by-spec."harmony-reflect"."^1.4.2" = - self.by-version."harmony-reflect"."1.4.4"; - by-version."harmony-reflect"."1.4.4" = self.buildNodePackage { - name = "harmony-reflect-1.4.4"; - version = "1.4.4"; + self.by-version."harmony-reflect"."1.4.5"; + by-version."harmony-reflect"."1.4.5" = self.buildNodePackage { + name = "harmony-reflect-1.4.5"; + version = "1.4.5"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.4.tgz"; - name = "harmony-reflect-1.4.4.tgz"; - sha1 = "7abb109183ba577f4b14f8574e98c8b38f97f9ad"; + url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.5.tgz"; + name = "harmony-reflect-1.4.5.tgz"; + sha1 = "a762be580997f2958e8dc61169a056b269e53bdc"; }; deps = { }; @@ -22185,8 +22028,6 @@ }; by-spec."ip"."^0.3.0" = self.by-version."ip"."0.3.3"; - by-spec."ip"."^0.3.2" = - self.by-version."ip"."0.3.3"; by-spec."ip"."^1.0.1" = self.by-version."ip"."1.1.2"; by-version."ip"."1.1.2" = self.buildNodePackage { @@ -22206,6 +22047,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."ip"."^1.1.2" = + self.by-version."ip"."1.1.2"; by-spec."ip-regex"."^1.0.0" = self.by-version."ip-regex"."1.0.3"; by-version."ip-regex"."1.0.3" = self.buildNodePackage { @@ -22343,7 +22186,7 @@ "winston-2.2.0" = self.by-version."winston"."2.2.0"; "nconf-0.8.4" = self.by-version."nconf"."0.8.4"; "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; - "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2"; + "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3"; "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2"; "jade-1.11.0" = self.by-version."jade"."1.11.0"; "passport-0.3.2" = self.by-version."passport"."0.3.2"; @@ -22443,25 +22286,6 @@ }; by-spec."is-buffer"."^1.1.0" = self.by-version."is-buffer"."1.1.3"; - by-spec."is-buffer"."~ 1.0.2" = - self.by-version."is-buffer"."1.0.2"; - by-version."is-buffer"."1.0.2" = self.buildNodePackage { - name = "is-buffer-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz"; - name = "is-buffer-1.0.2.tgz"; - sha1 = "f5c6c051d73f86f11b4ee14267cc1029fce261d0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."is-builtin-module"."^1.0.0" = self.by-version."is-builtin-module"."1.0.0"; by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { @@ -23151,7 +22975,7 @@ sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; deps = { - "node-fetch-1.4.1" = self.by-version."node-fetch"."1.4.1"; + "node-fetch-1.5.0" = self.by-version."node-fetch"."1.5.0"; "whatwg-fetch-0.11.0" = self.by-version."whatwg-fetch"."0.11.0"; }; optionalDependencies = { @@ -23212,20 +23036,20 @@ }; "istanbul" = self.by-version."istanbul"."1.0.0-alpha.2"; by-spec."istanbul"."^0.4.0" = - self.by-version."istanbul"."0.4.2"; - by-version."istanbul"."0.4.2" = self.buildNodePackage { - name = "istanbul-0.4.2"; - version = "0.4.2"; + self.by-version."istanbul"."0.4.3"; + by-version."istanbul"."0.4.3" = self.buildNodePackage { + name = "istanbul-0.4.3"; + version = "0.4.3"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.2.tgz"; - name = "istanbul-0.4.2.tgz"; - sha1 = "765e728b9455beddb6daa7b9cec4b9c3c3ede487"; + url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz"; + name = "istanbul-0.4.3.tgz"; + sha1 = "5b714ee0ae493ac5ef204b99f3872bceef73d53a"; }; deps = { "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; "async-1.5.2" = self.by-version."async"."1.5.2"; - "escodegen-1.7.1" = self.by-version."escodegen"."1.7.1"; + "escodegen-1.8.0" = self.by-version."escodegen"."1.8.0"; "esprima-2.7.2" = self.by-version."esprima"."2.7.2"; "fileset-0.2.1" = self.by-version."fileset"."0.2.1"; "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5"; @@ -24350,28 +24174,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."jstransform"."^10.0.1" = - self.by-version."jstransform"."10.1.0"; - by-version."jstransform"."10.1.0" = self.buildNodePackage { - name = "jstransform-10.1.0"; - version = "10.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; - name = "jstransform-10.1.0.tgz"; - sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; - }; - deps = { - "base62-0.1.1" = self.by-version."base62"."0.1.1"; - "esprima-fb-13001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb"; - "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."jstransform"."^11.0.0" = self.by-version."jstransform"."11.0.3"; by-version."jstransform"."11.0.3" = self.buildNodePackage { @@ -24642,7 +24444,7 @@ "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3"; "colors-1.1.2" = self.by-version."colors"."1.1.2"; "connect-3.4.1" = self.by-version."connect"."3.4.1"; - "core-js-2.2.1" = self.by-version."core-js"."2.2.1"; + "core-js-2.2.2" = self.by-version."core-js"."2.2.2"; "di-0.0.1" = self.by-version."di"."0.0.1"; "dom-serialize-2.2.1" = self.by-version."dom-serialize"."2.2.1"; "expand-braces-0.1.2" = self.by-version."expand-braces"."0.1.2"; @@ -24705,7 +24507,7 @@ sha1 = "b0d58b1025d59d5c6620263186f1d58f5d5348c5"; }; deps = { - "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2"; + "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3"; "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12"; "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0"; "source-map-0.5.3" = self.by-version."source-map"."0.5.3"; @@ -25542,27 +25344,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."levn"."~0.2.5" = - self.by-version."levn"."0.2.5"; - by-version."levn"."0.2.5" = self.buildNodePackage { - name = "levn-0.2.5"; - version = "0.2.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; - name = "levn-0.2.5.tgz"; - sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; - }; - deps = { - "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2"; - "type-check-0.3.2" = self.by-version."type-check"."0.3.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."levn"."~0.3.0" = self.by-version."levn"."0.3.0"; by-version."levn"."0.3.0" = self.buildNodePackage { @@ -26751,7 +26532,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."lodash.keys"."~4.0.5" = + by-spec."lodash.keys"."~4.0.6" = self.by-version."lodash.keys"."4.0.6"; by-spec."lodash.memoize"."~3.0.3" = self.by-version."lodash.memoize"."3.0.4"; @@ -27159,6 +26940,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."loose-envify"."^1.1.0" = + self.by-version."loose-envify"."1.1.0"; by-spec."loud-rejection"."^1.0.0" = self.by-version."loud-rejection"."1.3.0"; by-version."loud-rejection"."1.3.0" = self.buildNodePackage { @@ -27550,15 +27333,15 @@ by-spec."magnet-uri"."~2.0.0" = self.by-version."magnet-uri"."2.0.1"; by-spec."mailchimp".">=1.1.0" = - self.by-version."mailchimp"."1.1.5"; - by-version."mailchimp"."1.1.5" = self.buildNodePackage { - name = "mailchimp-1.1.5"; - version = "1.1.5"; + self.by-version."mailchimp"."1.1.6"; + by-version."mailchimp"."1.1.6" = self.buildNodePackage { + name = "mailchimp-1.1.6"; + version = "1.1.6"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.5.tgz"; - name = "mailchimp-1.1.5.tgz"; - sha1 = "63d560056179301c41bb6f7cadc584944312909c"; + url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.6.tgz"; + name = "mailchimp-1.1.6.tgz"; + sha1 = "5aa72867e3043f173de6d1ff6965e6ed3ea55b61"; }; deps = { "request-2.70.0" = self.by-version."request"."2.70.0"; @@ -27772,28 +27555,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."md5"."~2.0.0" = - self.by-version."md5"."2.0.0"; - by-version."md5"."2.0.0" = self.buildNodePackage { - name = "md5-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz"; - name = "md5-2.0.0.tgz"; - sha1 = "75e392e0ebd5a9b88dc7cb7a93875137b87c8a33"; - }; - deps = { - "charenc-0.0.1" = self.by-version."charenc"."0.0.1"; - "crypt-0.0.1" = self.by-version."crypt"."0.0.1"; - "is-buffer-1.0.2" = self.by-version."is-buffer"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."mdns-js"."*" = self.by-version."mdns-js"."0.5.0"; by-version."mdns-js"."0.5.0" = self.buildNodePackage { @@ -28645,6 +28406,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."minimatch"."0.2" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = self.buildNodePackage { + name = "minimatch-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + deps = { + "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3"; + "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."minimatch"."0.3" = self.by-version."minimatch"."0.3.0"; by-version."minimatch"."0.3.0" = self.buildNodePackage { @@ -28741,25 +28523,6 @@ self.by-version."minimatch"."3.0.0"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = self.buildNodePackage { - name = "minimatch-0.2.14"; - version = "0.2.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - deps = { - "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3"; - "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = @@ -29461,7 +29224,27 @@ cpu = [ ]; }; by-spec."mongodb".">= 1.2.0 <2.2.0" = - self.by-version."mongodb"."2.1.14"; + self.by-version."mongodb"."2.1.16"; + by-version."mongodb"."2.1.16" = self.buildNodePackage { + name = "mongodb-2.1.16"; + version = "2.1.16"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.16.tgz"; + name = "mongodb-2.1.16.tgz"; + sha1 = "8501a7465574ef4b605c46c98cd6bd57fc4968fa"; + }; + deps = { + "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2"; + "mongodb-core-1.3.16" = self.by-version."mongodb-core"."1.3.16"; + "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."mongodb"."~2.0" = self.by-version."mongodb"."2.0.55"; by-spec."mongodb-core"."1.2.19" = @@ -29476,7 +29259,7 @@ sha1 = "fcb35f6b6abc5c3de1f1a4a5db526b9e306f3eb7"; }; deps = { - "bson-0.4.22" = self.by-version."bson"."0.4.22"; + "bson-0.4.23" = self.by-version."bson"."0.4.23"; }; optionalDependencies = { "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19"; @@ -29497,7 +29280,7 @@ sha1 = "f1e6405f03d40846fdb838a702507affa3cb2c39"; }; deps = { - "bson-0.4.22" = self.by-version."bson"."0.4.22"; + "bson-0.4.23" = self.by-version."bson"."0.4.23"; }; optionalDependencies = { }; @@ -29518,7 +29301,28 @@ sha1 = "0a8e8719461ed98f36ed981ae00fa65d8b97781d"; }; deps = { - "bson-0.4.22" = self.by-version."bson"."0.4.22"; + "bson-0.4.23" = self.by-version."bson"."0.4.23"; + "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mongodb-core"."1.3.16" = + self.by-version."mongodb-core"."1.3.16"; + by-version."mongodb-core"."1.3.16" = self.buildNodePackage { + name = "mongodb-core-1.3.16"; + version = "1.3.16"; + bin = false; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.16.tgz"; + name = "mongodb-core-1.3.16.tgz"; + sha1 = "6f9905bc7be0c890333a011d0313e5f0e2769a3b"; + }; + deps = { + "bson-0.4.23" = self.by-version."bson"."0.4.23"; "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0"; }; optionalDependencies = { @@ -29540,7 +29344,7 @@ }; deps = { "async-1.5.2" = self.by-version."async"."1.5.2"; - "bson-0.4.22" = self.by-version."bson"."0.4.22"; + "bson-0.4.23" = self.by-version."bson"."0.4.23"; "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0"; "kareem-1.0.1" = self.by-version."kareem"."1.0.1"; "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14"; @@ -29625,7 +29429,7 @@ }; deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "bson-0.4.22" = self.by-version."bson"."0.4.22"; + "bson-0.4.23" = self.by-version."bson"."0.4.23"; "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0"; "kareem-1.0.1" = self.by-version."kareem"."1.0.1"; "mongodb-2.0.46" = self.by-version."mongodb"."2.0.46"; @@ -29674,7 +29478,7 @@ sha1 = "f63dd313c422a3871f5569e36b0d28ca1a224631"; }; deps = { - "harmony-reflect-1.4.4" = self.by-version."harmony-reflect"."1.4.4"; + "harmony-reflect-1.4.5" = self.by-version."harmony-reflect"."1.4.5"; "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4"; }; optionalDependencies = { @@ -31150,15 +30954,15 @@ by-spec."node-expat"."~2.3.8" = self.by-version."node-expat"."2.3.13"; by-spec."node-fetch"."^1.0.1" = - self.by-version."node-fetch"."1.4.1"; - by-version."node-fetch"."1.4.1" = self.buildNodePackage { - name = "node-fetch-1.4.1"; - version = "1.4.1"; + self.by-version."node-fetch"."1.5.0"; + by-version."node-fetch"."1.5.0" = self.buildNodePackage { + name = "node-fetch-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.4.1.tgz"; - name = "node-fetch-1.4.1.tgz"; - sha1 = "f50a3a98a586c434e9a63984c97127eb33c09145"; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.5.0.tgz"; + name = "node-fetch-1.5.0.tgz"; + sha1 = "c1b82cda9579aa57ee05b838278183c6e997f642"; }; deps = { "encoding-0.1.12" = self.by-version."encoding"."0.1.12"; @@ -31402,26 +31206,26 @@ cpu = [ ]; }; by-spec."node-pre-gyp"."0.6.x" = - self.by-version."node-pre-gyp"."0.6.25"; - by-version."node-pre-gyp"."0.6.25" = self.buildNodePackage { - name = "node-pre-gyp-0.6.25"; - version = "0.6.25"; + self.by-version."node-pre-gyp"."0.6.26"; + by-version."node-pre-gyp"."0.6.26" = self.buildNodePackage { + name = "node-pre-gyp-0.6.26"; + version = "0.6.26"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.25.tgz"; - name = "node-pre-gyp-0.6.25.tgz"; - sha1 = "2c6818775e6f1df5e353ba8024f1c0118726545b"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.26.tgz"; + name = "node-pre-gyp-0.6.26.tgz"; + sha1 = "d4fae0d69030d60e394169cdae5a4fbcad788630"; }; deps = { + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; "nopt-3.0.6" = self.by-version."nopt"."3.0.6"; "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3"; + "rc-1.1.6" = self.by-version."rc"."1.1.6"; "request-2.70.0" = self.by-version."request"."2.70.0"; + "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2"; "semver-5.1.0" = self.by-version."semver"."5.1.0"; "tar-2.2.1" = self.by-version."tar"."2.2.1"; "tar-pack-3.1.3" = self.by-version."tar-pack"."3.1.3"; - "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; - "rc-1.1.6" = self.by-version."rc"."1.1.6"; - "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2"; }; optionalDependencies = { }; @@ -31430,9 +31234,9 @@ cpu = [ ]; }; by-spec."node-pre-gyp"."^0.6.25" = - self.by-version."node-pre-gyp"."0.6.25"; + self.by-version."node-pre-gyp"."0.6.26"; by-spec."node-pre-gyp"."^0.6.5" = - self.by-version."node-pre-gyp"."0.6.25"; + self.by-version."node-pre-gyp"."0.6.26"; by-spec."node-pre-gyp-github"."^1.1.0" = self.by-version."node-pre-gyp-github"."1.1.2"; by-version."node-pre-gyp-github"."1.1.2" = self.buildNodePackage { @@ -31457,15 +31261,15 @@ cpu = [ ]; }; by-spec."node-protobuf"."*" = - self.by-version."node-protobuf"."1.2.13"; - by-version."node-protobuf"."1.2.13" = self.buildNodePackage { - name = "node-protobuf-1.2.13"; - version = "1.2.13"; + self.by-version."node-protobuf"."1.2.14"; + by-version."node-protobuf"."1.2.14" = self.buildNodePackage { + name = "node-protobuf-1.2.14"; + version = "1.2.14"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.13.tgz"; - name = "node-protobuf-1.2.13.tgz"; - sha1 = "744601255c78384fbb1f2523bb3239e91df4f620"; + url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.14.tgz"; + name = "node-protobuf-1.2.14.tgz"; + sha1 = "99fced0cd2e6daeba48c664f99b13d1df930d0a0"; }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; @@ -31477,7 +31281,7 @@ os = [ ]; cpu = [ ]; }; - "node-protobuf" = self.by-version."node-protobuf"."1.2.13"; + "node-protobuf" = self.by-version."node-protobuf"."1.2.14"; by-spec."node-red"."*" = self.by-version."node-red"."0.13.4"; by-version."node-red"."0.13.4" = self.buildNodePackage { @@ -31901,7 +31705,7 @@ "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; "debug-2.2.0" = self.by-version."debug"."2.2.0"; "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0"; - "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2"; + "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3"; "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0"; "request-2.70.0" = self.by-version."request"."2.70.0"; @@ -32594,15 +32398,15 @@ cpu = [ ]; }; by-spec."npm"."*" = - self.by-version."npm"."3.8.6"; - by-version."npm"."3.8.6" = self.buildNodePackage { - name = "npm-3.8.6"; - version = "3.8.6"; + self.by-version."npm"."3.8.7"; + by-version."npm"."3.8.7" = self.buildNodePackage { + name = "npm-3.8.7"; + version = "3.8.7"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.8.6.tgz"; - name = "npm-3.8.6.tgz"; - sha1 = "f9cb7b736e72c3b854895f6c054f830931ab14c6"; + url = "https://registry.npmjs.org/npm/-/npm-3.8.7.tgz"; + name = "npm-3.8.7.tgz"; + sha1 = "dabc1c63f6eef1cb30e3e560966fdd9affe5a1ee"; }; deps = { "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7"; @@ -32659,7 +32463,7 @@ "read-package-tree-5.1.2" = self.by-version."read-package-tree"."5.1.2"; "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6"; "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1"; - "request-2.69.0" = self.by-version."request"."2.69.0"; + "request-2.70.0" = self.by-version."request"."2.70.0"; "retry-0.9.0" = self.by-version."retry"."0.9.0"; "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2"; "semver-5.1.0" = self.by-version."semver"."5.1.0"; @@ -32695,7 +32499,7 @@ os = [ ]; cpu = [ ]; }; - "npm" = self.by-version."npm"."3.8.6"; + "npm" = self.by-version."npm"."3.8.7"; by-spec."npm"."^2.1.12" = self.by-version."npm"."2.15.3"; by-version."npm"."2.15.3" = self.buildNodePackage { @@ -32766,7 +32570,7 @@ "sha-2.0.1" = self.by-version."sha"."2.0.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; - "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0"; + "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1"; "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1"; "tar-2.2.1" = self.by-version."tar"."2.2.1"; "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; @@ -32789,7 +32593,7 @@ by-spec."npm"."^2.10.x" = self.by-version."npm"."2.15.3"; by-spec."npm"."^3.5.1" = - self.by-version."npm"."3.8.6"; + self.by-version."npm"."3.8.7"; by-spec."npm-cache-filename"."~1.0.2" = self.by-version."npm-cache-filename"."1.0.2"; by-version."npm-cache-filename"."1.0.2" = self.buildNodePackage { @@ -32832,7 +32636,7 @@ "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3"; "lodash-3.10.1" = self.by-version."lodash"."3.10.1"; "node-alias-1.0.4" = self.by-version."node-alias"."1.0.4"; - "npm-3.8.6" = self.by-version."npm"."3.8.6"; + "npm-3.8.7" = self.by-version."npm"."3.8.7"; "npmi-1.0.1" = self.by-version."npmi"."1.0.1"; "require-dir-0.3.0" = self.by-version."require-dir"."0.3.0"; "semver-5.1.0" = self.by-version."semver"."5.1.0"; @@ -34088,31 +33892,6 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; - by-spec."optionator"."^0.5.0" = - self.by-version."optionator"."0.5.0"; - by-version."optionator"."0.5.0" = self.buildNodePackage { - name = "optionator-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz"; - name = "optionator-0.5.0.tgz"; - sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368"; - }; - deps = { - "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "type-check-0.3.2" = self.by-version."type-check"."0.3.2"; - "levn-0.2.5" = self.by-version."levn"."0.2.5"; - "fast-levenshtein-1.0.7" = self.by-version."fast-levenshtein"."1.0.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."optionator"."^0.8.1" = self.by-version."optionator"."0.8.1"; by-version."optionator"."0.8.1" = self.buildNodePackage { @@ -34892,7 +34671,7 @@ "connect-busboy-0.0.2" = self.by-version."connect-busboy"."0.0.2"; "core-js-0.8.4" = self.by-version."core-js"."0.8.4"; "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "domino-1.0.23" = self.by-version."domino"."1.0.23"; + "domino-1.0.24" = self.by-version."domino"."1.0.24"; "entities-1.1.1" = self.by-version."entities"."1.1.1"; "express-4.13.4" = self.by-version."express"."4.13.4"; "express-handlebars-2.0.1" = self.by-version."express-handlebars"."2.0.1"; @@ -36060,21 +35839,21 @@ cpu = [ ]; }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."2.1.3"; - by-version."phantomjs"."2.1.3" = self.buildNodePackage { - name = "phantomjs-2.1.3"; - version = "2.1.3"; + self.by-version."phantomjs"."2.1.7"; + by-version."phantomjs"."2.1.7" = self.buildNodePackage { + name = "phantomjs-2.1.7"; + version = "2.1.7"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.3.tgz"; - name = "phantomjs-2.1.3.tgz"; - sha1 = "330c254837c474ec022b70fa1e9b6202309e7556"; + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz"; + name = "phantomjs-2.1.7.tgz"; + sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134"; }; deps = { - "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; + "extract-zip-1.5.0" = self.by-version."extract-zip"."1.5.0"; "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7"; + "hasha-2.2.0" = self.by-version."hasha"."2.2.0"; "kew-0.7.0" = self.by-version."kew"."0.7.0"; - "md5-2.0.0" = self.by-version."md5"."2.0.0"; "progress-1.1.8" = self.by-version."progress"."1.1.8"; "request-2.67.0" = self.by-version."request"."2.67.0"; "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1"; @@ -36086,7 +35865,7 @@ os = [ ]; cpu = [ ]; }; - "phantomjs" = self.by-version."phantomjs"."2.1.3"; + "phantomjs" = self.by-version."phantomjs"."2.1.7"; by-spec."phantomjs"."1.9.7-15" = self.by-version."phantomjs"."1.9.7-15"; by-version."phantomjs"."1.9.7-15" = self.buildNodePackage { @@ -36214,7 +35993,7 @@ }; deps = { "async-0.9.2" = self.by-version."async"."0.9.2"; - "aws-sdk-2.3.0" = self.by-version."aws-sdk"."2.3.0"; + "aws-sdk-2.3.2" = self.by-version."aws-sdk"."2.3.2"; "errs-0.3.2" = self.by-version."errs"."0.3.2"; "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14"; "fast-json-patch-0.5.6" = self.by-version."fast-json-patch"."0.5.6"; @@ -36526,7 +36305,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."prelude-ls"."~1.1.0" = + by-spec."prelude-ls"."~1.1.2" = self.by-version."prelude-ls"."1.1.2"; by-version."prelude-ls"."1.1.2" = self.buildNodePackage { name = "prelude-ls-1.1.2"; @@ -36545,10 +36324,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."prelude-ls"."~1.1.1" = - self.by-version."prelude-ls"."1.1.2"; - by-spec."prelude-ls"."~1.1.2" = - self.by-version."prelude-ls"."1.1.2"; by-spec."prepend-http"."^1.0.0" = self.by-version."prepend-http"."1.0.3"; by-version."prepend-http"."1.0.3" = self.buildNodePackage { @@ -38321,19 +38096,20 @@ cpu = [ ]; }; by-spec."react"."*" = - self.by-version."react"."15.0.0-rc.2"; - by-version."react"."15.0.0-rc.2" = self.buildNodePackage { - name = "react-15.0.0-rc.2"; - version = "15.0.0-rc.2"; + self.by-version."react"."15.0.0"; + by-version."react"."15.0.0" = self.buildNodePackage { + name = "react-15.0.0"; + version = "15.0.0"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-15.0.0-rc.2.tgz"; - name = "react-15.0.0-rc.2.tgz"; - sha1 = "acfb768af86deb06b5bbb676778d5ec90661faa3"; + url = "https://registry.npmjs.org/react/-/react-15.0.0.tgz"; + name = "react-15.0.0.tgz"; + sha1 = "3c7e16531d630e15c1a50a947f14ba61746af8a7"; }; deps = { - "envify-3.4.0" = self.by-version."envify"."3.4.0"; "fbjs-0.8.0" = self.by-version."fbjs"."0.8.0"; + "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0"; + "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; }; optionalDependencies = { }; @@ -38341,7 +38117,7 @@ os = [ ]; cpu = [ ]; }; - "react" = self.by-version."react"."15.0.0-rc.2"; + "react" = self.by-version."react"."15.0.0"; by-spec."react-tools"."*" = self.by-version."react-tools"."0.14.0-alpha3"; by-version."react-tools"."0.14.0-alpha3" = self.buildNodePackage { @@ -40192,6 +39968,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."request"."~2.70.0" = + self.by-version."request"."2.70.0"; by-spec."request-progress"."^0.3.1" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = self.buildNodePackage { @@ -40538,15 +40316,15 @@ cpu = [ ]; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."2.2.3"; - by-version."rethinkdb"."2.2.3" = self.buildNodePackage { - name = "rethinkdb-2.2.3"; - version = "2.2.3"; + self.by-version."rethinkdb"."2.3.0"; + by-version."rethinkdb"."2.3.0" = self.buildNodePackage { + name = "rethinkdb-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.2.3.tgz"; - name = "rethinkdb-2.2.3.tgz"; - sha1 = "26036a6b1055a8dcac803828ee869e1fa84233ba"; + url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.0.tgz"; + name = "rethinkdb-2.3.0.tgz"; + sha1 = "101942b27954af48e93c031d040dc76b5d3475cc"; }; deps = { "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2"; @@ -40557,7 +40335,7 @@ os = [ ]; cpu = [ ]; }; - "rethinkdb" = self.by-version."rethinkdb"."2.2.3"; + "rethinkdb" = self.by-version."rethinkdb"."2.3.0"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = self.buildNodePackage { @@ -41138,7 +40916,7 @@ optionalDependencies = { }; peerDependencies = [ - self.by-version."aws-sdk"."2.3.0"]; + self.by-version."aws-sdk"."2.3.2"]; os = [ ]; cpu = [ ]; }; @@ -42047,7 +41825,7 @@ "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "debug-2.2.0" = self.by-version."debug"."2.2.0"; "nan-2.0.9" = self.by-version."nan"."2.0.9"; - "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25"; + "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26"; "node-pre-gyp-github-1.1.2" = self.by-version."node-pre-gyp-github"."1.1.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "sf-0.1.7" = self.by-version."sf"."0.1.7"; @@ -43121,16 +42899,16 @@ cpu = [ ]; }; "sloc" = self.by-version."sloc"."0.1.10"; - by-spec."smart-buffer"."^1.0.1" = - self.by-version."smart-buffer"."1.0.3"; - by-version."smart-buffer"."1.0.3" = self.buildNodePackage { - name = "smart-buffer-1.0.3"; - version = "1.0.3"; + by-spec."smart-buffer"."^1.0.4" = + self.by-version."smart-buffer"."1.0.4"; + by-version."smart-buffer"."1.0.4" = self.buildNodePackage { + name = "smart-buffer-1.0.4"; + version = "1.0.4"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.3.tgz"; - name = "smart-buffer-1.0.3.tgz"; - sha1 = "0968621e5e8b849da26a3ed707f044ae39edd8f5"; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.4.tgz"; + name = "smart-buffer-1.0.4.tgz"; + sha1 = "2cc20003c8be2f08082768a84cf2c684cca8a309"; }; deps = { }; @@ -43661,19 +43439,19 @@ }; "sockjs" = self.by-version."sockjs"."0.3.16"; by-spec."socks"."~1.1.5" = - self.by-version."socks"."1.1.8"; - by-version."socks"."1.1.8" = self.buildNodePackage { - name = "socks-1.1.8"; - version = "1.1.8"; + self.by-version."socks"."1.1.9"; + by-version."socks"."1.1.9" = self.buildNodePackage { + name = "socks-1.1.9"; + version = "1.1.9"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.8.tgz"; - name = "socks-1.1.8.tgz"; - sha1 = "dd731a23ea237680293b09a07b085a271b558d4b"; + url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; + name = "socks-1.1.9.tgz"; + sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; }; deps = { - "ip-0.3.3" = self.by-version."ip"."0.3.3"; - "smart-buffer-1.0.3" = self.by-version."smart-buffer"."1.0.3"; + "ip-1.1.2" = self.by-version."ip"."1.1.2"; + "smart-buffer-1.0.4" = self.by-version."smart-buffer"."1.0.4"; }; optionalDependencies = { }; @@ -43695,7 +43473,7 @@ deps = { "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "socks-1.1.8" = self.by-version."socks"."1.1.8"; + "socks-1.1.9" = self.by-version."socks"."1.1.9"; }; optionalDependencies = { }; @@ -43840,26 +43618,6 @@ cpu = [ ]; }; "source-map" = self.by-version."source-map"."0.5.3"; - by-spec."source-map"."0.1.31" = - self.by-version."source-map"."0.1.31"; - by-version."source-map"."0.1.31" = self.buildNodePackage { - name = "source-map-0.1.31"; - version = "0.1.31"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; - name = "source-map-0.1.31.tgz"; - sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; - }; - deps = { - "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."source-map"."0.1.32" = self.by-version."source-map"."0.1.32"; by-version."source-map"."0.1.32" = self.buildNodePackage { @@ -44098,7 +43856,7 @@ sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; }; deps = { - "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0"; + "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1"; }; optionalDependencies = { }; @@ -44138,7 +43896,7 @@ }; deps = { "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; - "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0"; + "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1"; }; optionalDependencies = { }; @@ -44147,15 +43905,15 @@ cpu = [ ]; }; by-spec."spdx-license-ids"."^1.0.0" = - self.by-version."spdx-license-ids"."1.2.0"; - by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage { - name = "spdx-license-ids-1.2.0"; - version = "1.2.0"; + self.by-version."spdx-license-ids"."1.2.1"; + by-version."spdx-license-ids"."1.2.1" = self.buildNodePackage { + name = "spdx-license-ids-1.2.1"; + version = "1.2.1"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"; - name = "spdx-license-ids-1.2.0.tgz"; - sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2"; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.1.tgz"; + name = "spdx-license-ids-1.2.1.tgz"; + sha1 = "d07ea17a4d2fd9351f9d94e2ff9cec74180fe8f3"; }; deps = { }; @@ -44166,9 +43924,9 @@ cpu = [ ]; }; by-spec."spdx-license-ids"."^1.0.2" = - self.by-version."spdx-license-ids"."1.2.0"; + self.by-version."spdx-license-ids"."1.2.1"; by-spec."spdx-license-ids"."~1.2.0" = - self.by-version."spdx-license-ids"."1.2.0"; + self.by-version."spdx-license-ids"."1.2.1"; by-spec."spdy"."^1.26.5" = self.by-version."spdy"."1.32.5"; by-version."spdy"."1.32.5" = self.buildNodePackage { @@ -45847,15 +45605,15 @@ cpu = [ ]; }; by-spec."tar-stream"."^1.0.0" = - self.by-version."tar-stream"."1.4.0"; - by-version."tar-stream"."1.4.0" = self.buildNodePackage { - name = "tar-stream-1.4.0"; - version = "1.4.0"; + self.by-version."tar-stream"."1.5.1"; + by-version."tar-stream"."1.5.1" = self.buildNodePackage { + name = "tar-stream-1.5.1"; + version = "1.5.1"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.4.0.tgz"; - name = "tar-stream-1.4.0.tgz"; - sha1 = "19f7fbc0868b3ec283fa87df4ca906d4b16854f2"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.1.tgz"; + name = "tar-stream-1.5.1.tgz"; + sha1 = "516c74d1bea3e131cc0b9348929c9a83f0a2ad11"; }; deps = { "bl-1.1.2" = self.by-version."bl"."1.1.2"; @@ -45943,6 +45701,31 @@ self.by-version."temp"."0.8.3"; by-spec."temp"."~0.8.3" = self.by-version."temp"."0.8.3"; + by-spec."tern"."*" = + self.by-version."tern"."0.18.0"; + by-version."tern"."0.18.0" = self.buildNodePackage { + name = "tern-0.18.0"; + version = "0.18.0"; + bin = true; + src = fetchurl { + url = "https://registry.npmjs.org/tern/-/tern-0.18.0.tgz"; + name = "tern-0.18.0.tgz"; + sha1 = "c6177fe395c8ffc9c512f0ec7452a7d9c6220fa6"; + }; + deps = { + "acorn-2.7.0" = self.by-version."acorn"."2.7.0"; + "enhanced-resolve-0.9.1" = self.by-version."enhanced-resolve"."0.9.1"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "typescript-1.0.1" = self.by-version."typescript"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "tern" = self.by-version."tern"."0.18.0"; by-spec."text-encoding"."0.5.2" = self.by-version."text-encoding"."0.5.2"; by-version."text-encoding"."0.5.2" = self.buildNodePackage { @@ -46309,15 +46092,15 @@ cpu = [ ]; }; by-spec."time-stamp"."^1.0.0" = - self.by-version."time-stamp"."1.0.0"; - by-version."time-stamp"."1.0.0" = self.buildNodePackage { - name = "time-stamp-1.0.0"; - version = "1.0.0"; + self.by-version."time-stamp"."1.0.1"; + by-version."time-stamp"."1.0.1" = self.buildNodePackage { + name = "time-stamp-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz"; - name = "time-stamp-1.0.0.tgz"; - sha1 = "56b152e07ec2442c23d9ea690944076f38c535a1"; + url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz"; + name = "time-stamp-1.0.1.tgz"; + sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151"; }; deps = { }; @@ -47136,7 +46919,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."type-check"."~0.3.1" = + by-spec."type-check"."~0.3.2" = self.by-version."type-check"."0.3.2"; by-version."type-check"."0.3.2" = self.buildNodePackage { name = "type-check-0.3.2"; @@ -47156,8 +46939,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."type-check"."~0.3.2" = - self.by-version."type-check"."0.3.2"; by-spec."type-detect"."0.1.1" = self.by-version."type-detect"."0.1.1"; by-version."type-detect"."0.1.1" = self.buildNodePackage { @@ -47323,15 +47104,35 @@ cpu = [ ]; }; by-spec."typescript"."*" = - self.by-version."typescript"."1.9.0-dev.20160405"; - by-version."typescript"."1.9.0-dev.20160405" = self.buildNodePackage { - name = "typescript-1.9.0-dev.20160405"; - version = "1.9.0-dev.20160405"; + self.by-version."typescript"."1.9.0-dev.20160408"; + by-version."typescript"."1.9.0-dev.20160408" = self.buildNodePackage { + name = "typescript-1.9.0-dev.20160408"; + version = "1.9.0-dev.20160408"; + bin = true; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160408.tgz"; + name = "typescript-1.9.0-dev.20160408.tgz"; + sha1 = "0fab58c2fa44bd7562c9b410a495b29acfce4689"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "typescript" = self.by-version."typescript"."1.9.0-dev.20160408"; + by-spec."typescript"."=1.0.1" = + self.by-version."typescript"."1.0.1"; + by-version."typescript"."1.0.1" = self.buildNodePackage { + name = "typescript-1.0.1"; + version = "1.0.1"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160405.tgz"; - name = "typescript-1.9.0-dev.20160405.tgz"; - sha1 = "72db1600a5b884c528cc389ecb15b6d3cbfd35c5"; + url = "https://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; + name = "typescript-1.0.1.tgz"; + sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; }; deps = { }; @@ -47341,7 +47142,6 @@ os = [ ]; cpu = [ ]; }; - "typescript" = self.by-version."typescript"."1.9.0-dev.20160405"; by-spec."typewise"."^1.0.3" = self.by-version."typewise"."1.0.3"; by-version."typewise"."1.0.3" = self.buildNodePackage { @@ -48744,7 +48544,7 @@ }; deps = { "nan-2.2.1" = self.by-version."nan"."2.2.1"; - "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25"; + "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26"; }; optionalDependencies = { }; @@ -48764,7 +48564,7 @@ sha1 = "e85bbcd71a94a827ca42a33f63f7d01f54f1c24d"; }; deps = { - "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25"; + "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26"; "nan-2.0.9" = self.by-version."nan"."2.0.9"; }; optionalDependencies = { @@ -50719,7 +50519,7 @@ }; deps = { "sax-1.2.1" = self.by-version."sax"."1.2.1"; - "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0"; + "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2"; }; optionalDependencies = { }; @@ -50761,7 +50561,7 @@ }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0"; + "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2"; }; optionalDependencies = { }; @@ -50899,15 +50699,15 @@ cpu = [ ]; }; by-spec."xmlbuilder".">=1.0.0" = - self.by-version."xmlbuilder"."8.2.0"; - by-version."xmlbuilder"."8.2.0" = self.buildNodePackage { - name = "xmlbuilder-8.2.0"; - version = "8.2.0"; + self.by-version."xmlbuilder"."8.2.2"; + by-version."xmlbuilder"."8.2.2" = self.buildNodePackage { + name = "xmlbuilder-8.2.2"; + version = "8.2.2"; bin = false; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.0.tgz"; - name = "xmlbuilder-8.2.0.tgz"; - sha1 = "abf6e49feedd3296676b69c2de37c364dde1e263"; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; + name = "xmlbuilder-8.2.2.tgz"; + sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; }; deps = { }; @@ -50918,7 +50718,7 @@ cpu = [ ]; }; by-spec."xmlbuilder".">=2.4.6" = - self.by-version."xmlbuilder"."8.2.0"; + self.by-version."xmlbuilder"."8.2.2"; by-spec."xmlbuilder"."^4.1.0" = self.by-version."xmlbuilder"."4.2.1"; by-version."xmlbuilder"."4.2.1" = self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 1b05c05c56331..ceb41e2e1ef20 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -124,9 +124,9 @@ , "node-red" , "node-stringprep" , "node-uuid" -, "node-xmpp" , "node-xmpp-client" , "node-xmpp-component" +, "node-xmpp-core" , "node-xmpp-joap" , "node-xmpp-server" , "node-xmpp-serviceadmin" @@ -166,6 +166,7 @@ , "stylus" , "tar" , "temp" +, "tern" , "timezone" , "titanium" , "typescript" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a257dab37c96..da58b1c4cf832 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -30,6 +30,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; sha256 = "0gqv30666vlclnwylhk9i64s7raa70x4ncy6bg48s5gcxwrshjc5"; }; + outputs = ["out" "doc"]; # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; propagatedBuildInputs = [ FileNext ]; @@ -193,7 +194,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDeep TestException ]; meta = { description = "A persistence framework for session data"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -243,15 +244,15 @@ let self = _self // overrides; _self = with self; { }; Appcpanminus = buildPerlPackage rec { - name = "App-cpanminus-1.7039"; + name = "App-cpanminus-1.7040"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "1r34f30izvb0d124576nwg5x0jcdbzgwgxczpgbnd66g7wqdig09"; + sha256 = "fc8e5cde17cc5f4cc13aea8781c1e9425f76abc684cc720e9253f47ab3529556"; }; meta = { homepage = https://github.com/miyagawa/cpanminus; description = "Get, unpack, build and install modules from CPAN"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.all; }; }; @@ -311,7 +312,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Simpler definition of attribute handlers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -365,24 +366,24 @@ let self = _self // overrides; _self = with self; { name = "Archive-Extract-0.76"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1z2chz7a5q6024h9rmzpq0z53x0jw7983ia5k1yxsih3lw60irws"; + sha256 = "9ae7080ca70346dd7d9845c581d2e112f4513ec0f7d79c2011c0e0a2ce874cfc"; }; - propagatedBuildInputs = [ if_ ]; + propagatedBuildInputs = [ self."if" ]; meta = { description = "Generic archive extracting mechanism"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - ArchiveTar = buildPerlPackage { + ArchiveTar = buildPerlPackage rec { name = "Archive-Tar-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.04.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; sha256 = "c3741bba06a468a5a4db6a79d772c55cf2f6673cf33241a6e6a758707a71d293"; }; meta = { description = "Manipulates TAR archives"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -501,7 +502,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Load subroutines only on demand"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -526,17 +527,17 @@ let self = _self // overrides; _self = with self; { }; }; - BC = buildPerlPackage { - name = "B-C-1.52"; + BC = buildPerlPackage rec { + name = "B-C-1.54"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.52.tar.gz; - sha256 = "072b4b9e39431ad8ef5173557c26ade97f985cf150f6580a20f42dd9fc3651a7"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + sha256 = "d07e5af5fb798fcd3f4eda5e40744a14c1b3ef9e585a7dca55b5db31cb1d28d3"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { homepage = http://www.perl-compiler.org; description = "Perl compiler"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -586,14 +587,15 @@ let self = _self // overrides; _self = with self; { }; bignum = buildPerlPackage rec { - name = "bignum-0.41"; + name = "bignum-0.42"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "19bwz2yi2qf5lrhkkk8c320b5ixn0wl8662gmvq3gqzarngxf76l"; + sha256 = "5bc9a16fe6d56584cde0f183828d81466f2cfc08ec1b6ef15d25a732080a9b52"; }; + buildInputs = [ MathBigInt MathBigRat ]; meta = { description = "Transparent BigNumber support for Perl"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -967,7 +969,7 @@ let self = _self // overrides; _self = with self; { CatalystViewTT TemplateToolkit TestAggregate TestWWWMechanize TestWWWMechanizeCatalyst ]; propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystRuntime - ConfigAny HTMLFormFu Moose MooseXAttributeChained RegexpAssemble TaskWeaken + CGI ConfigAny HTMLFormFu Moose MooseXAttributeChained RegexpAssemble TaskWeaken namespaceautoclean ]; }; @@ -1174,6 +1176,32 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; }; + CatalystPluginFormValidator = buildPerlPackage rec { + name = "Catalyst-Plugin-FormValidator-0.094"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; + sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; + }; + propagatedBuildInputs = [ CatalystRuntime DataFormValidator MROCompat Moose ]; + meta = { + description = "Data::FormValidator"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + CatalystPluginFormValidatorSimple = buildPerlPackage rec { + name = "Catalyst-Plugin-FormValidator-Simple-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; + sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; + }; + propagatedBuildInputs = [ CatalystPluginFormValidator CatalystRuntime FormValidatorSimple ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + CatalystPluginUnicodeEncoding = buildPerlPackage { name = "Catalyst-Plugin-Unicode-Encoding-1.9"; src = fetchurl { @@ -1463,7 +1491,7 @@ let self = _self // overrides; _self = with self; { sha256 = "06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ HTTPMessage ]; + propagatedBuildInputs = [ CGI HTTPMessage ]; meta = { homepage = https://github.com/tokuhirom/p5-cgi-emulate-psgi; description = "PSGI adapter for CGI"; @@ -1515,6 +1543,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz; sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91"; }; + propagatedBuildInputs = [ CGI ]; meta = { description = "Adapt CGI.pm to the PSGI protocol"; license = "perl"; @@ -1790,7 +1819,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/${name}.tar.gz"; sha256 = "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy"; }; - preConfigure = "patchShebangs ."; + # Remove unnecessary, non-autoconf, configure script. + prePatch = "rm configure"; meta = { description = "A module for creating generic methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1818,21 +1848,25 @@ let self = _self // overrides; _self = with self; { sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; }; buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ParamsClassify]; + propagatedBuildInputs = [ ParamsClassify self."if" ]; + meta = { + description = "Dynamic class mixing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ClassMOP = Moose; - ClassReturnValue = buildPerlPackage { + ClassReturnValue = buildPerlPackage rec { name = "Class-ReturnValue-0.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz"; sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd"; }; propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "A smart return value object"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1981,7 +2015,7 @@ let self = _self // overrides; _self = with self; { # Don't build a private copy of bzip2. BUILD_BZIP2 = false; - BZIP2_LIB = "${pkgs.bzip2}/lib"; + BZIP2_LIB = "${pkgs.bzip2.out}/lib"; BZIP2_INCLUDE = "${pkgs.bzip2}/include"; meta = { @@ -2247,16 +2281,16 @@ let self = _self // overrides; _self = with self; { }; }; - CPAN = buildPerlPackage { + CPAN = buildPerlPackage rec { name = "CPAN-2.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.10.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; sha256 = "090e9e3d9fca83b89341a75c514c7411b743c887743723dbfe80f30d4ee5f3ad"; }; - propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2412,8 +2446,8 @@ let self = _self // overrides; _self = with self; { sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; CryptEksblowfish = buildPerlPackage rec { @@ -2533,7 +2567,7 @@ let self = _self // overrides; _self = with self; { sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; meta = with stdenv.lib; { homepage = https://metacpan.org/release/Crypt-OpenSSL-AES; description = "Perl wrapper around OpenSSL's AES library"; @@ -2550,7 +2584,7 @@ let self = _self // overrides; _self = with self; { sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptOpenSSLRandom = buildPerlPackage rec { @@ -2560,7 +2594,7 @@ let self = _self // overrides; _self = with self; { sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptOpenSSLRSA = buildPerlPackage rec { @@ -2571,7 +2605,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptSSLeay = buildPerlPackage rec { @@ -2580,7 +2614,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; - makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include"; + makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include"; buildInputs = [ PathClass TryTiny ]; }; @@ -2623,17 +2657,16 @@ let self = _self // overrides; _self = with self; { }; }; - CryptX = buildPerlModule { - name = "CryptX-0.026"; + CryptX = buildPerlPackage rec { + name = "CryptX-0.030"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.026.tar.gz; - sha256 = "0465843c86eb16b13717fde5b803c7390bb14805e277e1a1841a62e5124debc2"; + url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; + sha256 = "b0e26b4c4de66134f1f1ae4227fdd18cf10f95cecc64a651a8af2710ef7519e5"; }; - buildInputs = [ JSONMaybeXS ]; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2720,6 +2753,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; }; + DataFormValidator = buildPerlModule rec { + name = "Data-FormValidator-4.81"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; + sha256 = "f844056231b2eeb4068cafbcab1ddf5d46cb348bd5cfb1d234421c09ee8a0de3"; + }; + buildInputs = [ CGI ModuleBuild ]; + propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes Perl6Junction RegexpCommon ]; + meta = { + description = "Validates user input (usually from an HTML form) based on input profile"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataGUID = buildPerlPackage { name = "Data-GUID-0.048"; src = fetchurl { @@ -2730,7 +2777,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = https://github.com/rjbs/Data-GUID; description = "Globally unique identifiers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2765,7 +2812,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassAccessor ClassReturnValue TextvFileasData ]; meta = { description = "Generates iCalendar (RFC 2445) calendar files"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2844,7 +2891,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DataPage MathRound ]; meta = { - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2897,6 +2944,51 @@ let self = _self // overrides; _self = with self; { }; }; + DataValidateDomain = buildPerlPackage rec { + name = "Data-Validate-Domain-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "f2ae0830f423a46080b185ffc2428c9a37278167a8d19bfdeec26d977b43822c"; + }; + propagatedBuildInputs = [ NetDomainTLD ]; + meta = { + homepage = http://metacpan.org/release/Data-Validate-Domain; + description = "Domain and host name validation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + + DataValidateIP = buildPerlPackage rec { + name = "Data-Validate-IP-0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "b0386bb8aa31ed1b9b58760745eaab4d29edb0c7bdc7dc16dd5479d21f26ee3b"; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ NetAddrIP ]; + meta = { + homepage = http://metacpan.org/release/Data-Validate-IP; + description = "IPv4 and IPv6 validation methods"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + + DataValidateURI = buildPerlPackage rec { + name = "Data-Validate-URI-0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SO/SONNEN/${name}.tar.gz"; + sha256 = "f06418d2a4603913d1b6ce52b167dd13e787e13bf2be325a065df7d408f79c60"; + }; + propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; + meta = { + description = "Common URL validation methods"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + DataVisitor = buildPerlPackage rec { name = "Data-Visitor-0.30"; src = fetchurl { @@ -3018,7 +3110,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeTimeZone TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3030,8 +3122,8 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils ModulePluggable TestMockTime ]; meta = { - description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = "perl"; + description = "Flexibly parse strings and turn them into DateTime objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3068,7 +3160,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3086,7 +3178,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime ParamsValidate ]; meta = { description = "Convert between DateTime and RFC2822/822 formats"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3110,7 +3202,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz"; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -3166,7 +3258,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/DateTime-Format-W3CDTF/; description = "Parse and format W3CDTF datetime strings"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3185,28 +3277,29 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeSet = buildPerlPackage { - name = "DateTime-Set-0.3400"; + DateTimeSet = buildPerlPackage rec { + name = "DateTime-Set-0.3600"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3400.tar.gz; - sha256 = "1b27699zkj68w5ll9chjhs52vmf39f9via6x5r5844as30qh9zxb"; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; + sha256 = "83503960c773efadfe2b0255e61bc1eb531bb6f497463d3b3880d7a516bc2f13"; }; propagatedBuildInputs = [ DateTime SetInfinite ]; meta = { description = "DateTime set objects"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-1.94"; + name = "DateTime-TimeZone-1.97"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1crn4n6izzw2r0ymcb7px9b1bkis8hzczs48skk7szvs3svn3naz"; + sha256 = "68a5f4b0a77074f9cc96b2c1d2282e2110db74f55e43fbad72926cee0fd434c8"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ]; meta = { + homepage = http://metacpan.org/release/DateTime-TimeZone; description = "Time zone object base class and factory"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3279,8 +3372,8 @@ let self = _self // overrides; _self = with self; { }; meta = { homepage = http://search.cpan.org/dist/Devel-DProf; - description = "A B<DEPRECATED> Perl code profiler"; - license = "perl"; + description = "A DEPRECATED Perl code profiler"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3298,15 +3391,15 @@ let self = _self // overrides; _self = with self; { }; }; - DevelPPPort = buildPerlPackage { - name = "Devel-PPPort-3.31"; + DevelPPPort = buildPerlPackage rec { + name = "Devel-PPPort-3.32"; src = fetchurl { - url = mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz; - sha256 = "ead2c49f0442a26890723231a92d3c0ac6ac297b814839e421a77d7889a2471d"; + url = "mirror://cpan/authors/id/W/WO/WOLFSAGE/${name}.tar.gz"; + sha256 = "257801ef441f317bc79d20cdc72344e5b4ff6f685d65bdf79ff153e733fa3856"; }; meta = { description = "Perl/Pollution/Portability"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3319,7 +3412,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Devel-SelfStubber; description = "Generate stubs for a SelfLoading module"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3472,17 +3565,18 @@ let self = _self // overrides; _self = with self; { }; }; - DBIxClassSchemaLoader = buildPerlPackage { - name = "DBIx-Class-Schema-Loader-0.07043"; + DBIxClassSchemaLoader = buildPerlPackage rec { + name = "DBIx-Class-Schema-Loader-0.07045"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07043.tar.gz; - sha256 = "01944d429a420fcb961aa4ab002f884f3d54529b3346816502c27d31c956194d"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "b132c667aa7dfe6f054e097c3e572a7dbf8ad433500f085e372740d5bc23a440"; }; buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ]; propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -4281,6 +4375,19 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + EmailValidLoose = buildPerlPackage rec { + name = "Email-Valid-Loose-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "e718e76eddee240251c999e139c8cbe6f2cc80192da5af875cbd12fa8ab93a59"; + }; + propagatedBuildInputs = [ EmailValid ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + Encode = buildPerlPackage { name = "Encode-2.78"; src = fetchurl { @@ -4792,14 +4899,15 @@ let self = _self // overrides; _self = with self; { FileBaseDir = buildPerlPackage rec { version = "0.03"; name = "File-BaseDir-${version}"; - configurePhase = '' - preConfigure || true - perl Build.PL PREFIX="$out" prefix="$out" - ''; src = fetchurl { url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886"; }; + configurePhase = '' + preConfigure || true + perl Build.PL PREFIX="$out" prefix="$out" + ''; + propagatedBuildInputs = [ ModuleBuild ]; }; FileCheckTree = buildPerlPackage { @@ -4949,6 +5057,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ]; }; + FileMMagic = buildPerlPackage rec { + name = "File-MMagic-1.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KN/KNOK/${name}.tar.gz"; + sha256 = "cf0c1b1eb29705c02d97c2913648009c0be42ce93ec24b36c696bf2d4f5ebd7e"; + }; + meta = { + description = "Guess file type from contents"; + license = stdenv.lib.licenses.free; # Some form of BSD4/Apache mix. + }; + }; + FileModified = buildPerlPackage { name = "File-Modified-0.07"; src = fetchurl { @@ -5156,7 +5276,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; sha256 = "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59"; }; - propagatedBuildInputs = [ CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ]; + propagatedBuildInputs = [ + CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA + DateCalc DateTime JSON ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; @@ -5198,6 +5320,20 @@ let self = _self // overrides; _self = with self; { }; }; + FormValidatorSimple = buildPerlPackage rec { + name = "FormValidator-Simple-0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LY/LYOKATO/${name}.tar.gz"; + sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; + }; + propagatedBuildInputs = [ CGI ClassAccessor ClassDataAccessor ClassDataInheritable ClassInspector DateCalc DateTimeFormatStrptime EmailValid EmailValidLoose ListMoreUtils MailTools TieIxHash UNIVERSALrequire YAML ]; + meta = { + description = "Validation with simple chains of constraints"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + FreezeThaw = buildPerlPackage { name = "FreezeThaw-0.5001"; src = fetchurl { @@ -5239,7 +5375,7 @@ let self = _self // overrides; _self = with self; { # tests fail doCheck = false; - makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}"; + makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; GDSecurityImage = buildPerlPackage { @@ -5620,7 +5756,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fvilng85wc65pna898x7mp4hx73mhahl7j2s10gj76avmxdizsw"; }; buildInputs = [ FileShareDirInstall TestAggregate TestException ]; - propagatedBuildInputs = [ Clone ConfigAny DataVisitor DateTime + propagatedBuildInputs = [ CGI Clone ConfigAny DataVisitor DateTime DateTimeFormatBuilder DateTimeFormatNatural DateTimeFormatStrptime DateTimeLocale EmailValid FileShareDir HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten ListMoreUtils ModulePluggable Moose MooseXAliases @@ -5656,7 +5792,7 @@ let self = _self // overrides; _self = with self; { sha256 = "84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ CacheCache ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ]; + propagatedBuildInputs = [ CacheCache CGI ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ]; meta = { homepage = http://metacpan.org/release/HTML-Mason; description = "High-performance, dynamic web site authoring system"; @@ -6538,7 +6674,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; propagatedBuildInputs = [ mod_perl2 ]; - makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config"; + makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config"; preConfigure = '' # override broken prereq check substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\"" @@ -7194,10 +7330,15 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name ="Math-BigInt-1.9993"; + name = "Math-BigInt-1.999717"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "0zmzd4d2sjnhg5cdnqvqj78w5dkickszlxv1csdxsgdvmz8w0dyr"; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + sha256 = "871c936cbd943b95c5561b82f077cbb1bbb4c85bdae14b668eca985e2a051fb6"; + }; + meta = { + description = "Arbitrary size integer/float math package"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -7209,19 +7350,20 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.gmp ]; doCheck = false; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.260801"; + name = "Math-BigRat-0.260802"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "0ghzz7qzfvp70ywvb2vnvr06l62sx1bcjbrjyara0pmqdnvpysar"; + sha256 = "1b1ed448c355677bf6403705f8428fee5bdf2bb138a3fe721bf51414c1695508"; }; meta = { description = "Arbitrary big rational numbers"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -8609,6 +8751,7 @@ let self = _self // overrides; _self = with self; { version = "1.5.3"; USE_OPENLDAP = 1; LDAPSDKDIR = pkgs.openldap; + LDAPSDKLIBDIR = "${pkgs.openldap.out}/lib"; src = fetchurl { url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz"; sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x"; @@ -8714,10 +8857,15 @@ let self = _self // overrides; _self = with self; { }; NetAddrIP = buildPerlPackage rec { - name = "NetAddr-IP-4.075"; + name = "NetAddr-IP-4.079"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; - sha256 = "0fc8jvrcp42szscnn41sxz8z8qa4fr4dr9i9s067hvrhiyxpb0mb"; + sha256 = "ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7"; + }; + meta = { + description = "Manages IPv4 and IPv6 addresses and subnets"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -8872,6 +9020,19 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + NetDomainTLD = buildPerlPackage rec { + name = "Net-Domain-TLD-1.74"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALEXP/${name}.tar.gz"; + sha256 = "bf936cc20834d5b9497e33dc41c2da6a58536b7a1e0df0b8f6ce7ed5111ca868"; + }; + meta = { + description = "Work with TLD names"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + NetHTTP = buildPerlPackage { name = "Net-HTTP-6.09"; src = fetchurl { @@ -8912,7 +9073,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; }; - buildInputs = [ TestWarn ]; + buildInputs = [ ModuleBuild TestWarn ]; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; meta = { description = "An implementation of the OAuth protocol"; @@ -9012,8 +9173,14 @@ let self = _self // overrides; _self = with self; { sha256 = "1x6jjmhvsdq488k6wdg58ajnr4dmbcbk7imyv0aybkhj1ygw7ahv"; }; buildInputs = [ pkgs.openssl ]; - OPENSSL_PREFIX = pkgs.openssl; doCheck = false; # Test performs network access. + preConfigure = '' + mkdir openssl + ln -s ${pkgs.openssl.out}/lib openssl + ln -s ${pkgs.openssl.bin}/bin openssl + ln -s ${pkgs.openssl.dev}/include openssl + export OPENSSL_PREFIX=$(realpath openssl) + ''; meta = { description = "Perl extension for using OpenSSL"; license = "SSLeay"; @@ -9026,6 +9193,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.11002.tar.gz; sha256 = "032gyn1h3r5d83wvz7nj3k7g50wcf73lbbmjc18466ml90vigys0"; }; + buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ]; doCheck = false; meta = { @@ -10452,6 +10620,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s"; }; + setOutputFlags = false; buildInputs = [ pkgs.which ]; }; @@ -10862,11 +11031,11 @@ let self = _self // overrides; _self = with self; { libfile-stripnondeterminism = buildPerlPackage rec { name = "libstrip-nondeterminism-${version}"; - version = "0.014"; + version = "0.016"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/s/strip-nondeterminism/strip-nondeterminism_${version}.orig.tar.gz"; - sha256 = "0yiddi9r87iysa2msr6l5fc5631zmi5ldsy8m3sd9chrlhag361g"; + sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp"; }; buildInputs = [ ArchiveZip_1_53 pkgs.file ]; @@ -10875,11 +11044,11 @@ let self = _self // overrides; _self = with self; { strip-nondeterminism = buildPerlPackage rec { name = "strip-nondeterminism-${version}"; - version = "0.014"; + version = "0.016"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/s/strip-nondeterminism/strip-nondeterminism_${version}.orig.tar.gz"; - sha256 = "0yiddi9r87iysa2msr6l5fc5631zmi5ldsy8m3sd9chrlhag361g"; + sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp"; }; buildInputs = [ ArchiveZip_1_53 libfile-stripnondeterminism pkgs.file ]; @@ -11402,7 +11571,7 @@ let self = _self // overrides; _self = with self; { preConfigure = '' substituteInPlace Makefile.PL --replace '$Config{libpth}' \ - "'${pkgs.ncurses}/lib'" + "'${pkgs.ncurses.out}/lib'" ''; # Tests don't work because they require /dev/tty. @@ -12253,7 +12422,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; - propagatedBuildInputs = [ TestWWWMechanize WWWMechanizeCGI ]; + propagatedBuildInputs = [ CGI TestWWWMechanize WWWMechanizeCGI ]; meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; @@ -12726,6 +12895,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MA/MATTLAW/Text-Trim-1.02.tar.gz; sha256 = "1bnwjl5n04w8nnrzrm75ljn4pijqbijr9csfkjcs79h4gwn9lwqw"; }; + propagatedBuildInputs = [ CGI ModuleBuild ]; meta = { description = "Remove leading and/or trailing whitespace from strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -12767,16 +12937,16 @@ let self = _self // overrides; _self = with self; { }; }; - TextvFileasData = buildPerlPackage { + TextvFileasData = buildPerlPackage rec { name = "Text-vFile-asData-0.08"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a"; }; propagatedBuildInputs = [ ClassAccessorChained ]; meta = { description = "Parse vFile formatted files into data structures"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13007,7 +13177,7 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags @@ -13452,7 +13622,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; @@ -13593,7 +13763,7 @@ let self = _self // overrides; _self = with self; { patchPhase = if stdenv.isCygwin then '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm '' else null; - makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include"; + makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; }; XMLXPath = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a02c0246e6c4..7bcf655efe69e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -307,7 +307,7 @@ in modules // { doCheck = false; patchPhase = '' - substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl" + substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl" substituteInPlace letsencrypt/le_util.py --replace '"sw_vers"' '"/usr/bin/sw_vers"' ''; @@ -614,7 +614,7 @@ in modules // { mkdir -p $out/share cp -r extra/themes $out/share wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib:${pkgs.gpgme}/lib + --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}' ''; meta = { @@ -1224,11 +1224,11 @@ in modules // { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.10.1"; + version = "1.10.18"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz"; - sha256 = "159c8nfcighlkcbdzck102cp06g7rpgbbvxpb73vjymgqrzqywvb"; + sha256 = "0vdj7p4cwsbzhanhp5f2c0b0qr2gh76dyanji73avvj4jvdb5d4g"; }; # No tests included @@ -1237,6 +1237,7 @@ in modules // { propagatedBuildInputs = with self; [ botocore bcdoc + s3transfer six colorama docutils @@ -1767,18 +1768,21 @@ in modules // { }; bedup = buildPythonPackage rec { - name = "bedup-20140413"; + version = "0.10"; + name = "bedup-${version}"; src = pkgs.fetchgit { url = "https://github.com/g2p/bedup.git"; - rev = "5189e166145b8954ac41883f81ef3c3b50dc96ab"; - sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9"; + rev = "598fd4b"; + sha256 = "0s11dpf4k26n8qxrx6wcsr78vp98rx3yibzkh6ifmsyaqcmpm7wy"; }; buildInputs = with self; [ pkgs.btrfs-progs ]; propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ] ++ optionals (!isPyPy) [ cffi ]; + disabled = pythonOlder "3.3"; + # No proper test suite. Included tests cannot be run because of relative import doCheck = false; @@ -2505,12 +2509,12 @@ in modules // { }; botocore = buildPythonPackage rec { - version = "1.3.23"; # This version is required by awscli + version = "1.4.9"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "00iaapmy07zdhm2y23fk9igrskzdkix53j7g45lc5dg9nfyngq6j"; + sha256 = "07rp24lnpjlk0c889g0d8y2ykc711gi04w715nkm9mv734ndsman"; }; propagatedBuildInputs = @@ -2834,10 +2838,9 @@ in modules // { postPatch = '' # Hardcode cairo library path - # FIXME: for closure-size branch all pkgs.foo should be replaced with pkgs.foo.lib - substituteInPlace cairocffi/__init__.py --subst-var-by cairo ${pkgs.cairo} - substituteInPlace cairocffi/__init__.py --subst-var-by glib ${pkgs.glib} - substituteInPlace cairocffi/__init__.py --subst-var-by gdk_pixbuf ${pkgs.gdk_pixbuf} + substituteInPlace cairocffi/__init__.py --subst-var-by cairo ${pkgs.cairo.out} + substituteInPlace cairocffi/__init__.py --subst-var-by glib ${pkgs.glib.out} + substituteInPlace cairocffi/__init__.py --subst-var-by gdk_pixbuf ${pkgs.gdk_pixbuf.out} ''; meta = { @@ -3024,6 +3027,33 @@ in modules // { }; }; + # This package is no longer actively maintained and can be removed if it becomes broken. + cgkit = buildPythonPackage rec { + version = "2.0.0"; + name = "cgkit-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; + sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6"; + }; + + patches = [ ../development/python-modules/cgkit/scons-env.patch ]; + + buildInputs = with pkgs; [ scons boost mesa ]; + + preBuild = '' + cd supportlib + scons + cd - + ''; + + meta = { + homepage = http://cgkit.sourceforge.net; + description = "Python Computer Graphics Kit"; + maintainers = with maintainers; [ expipiplus1 ]; + }; + }; cheetah = buildPythonPackage rec { version = "2.4.4"; @@ -6016,7 +6046,7 @@ in modules // { preFixup = '' wrapProgram $out/bin/gtimelog \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \ ''; @@ -7372,7 +7402,7 @@ in modules // { preConfigure = '' cat > site.cfg << END [samplerate] - library_dirs=${pkgs.libsamplerate}/lib + library_dirs=${pkgs.libsamplerate.out}/lib include_dirs=${pkgs.libsamplerate}/include END ''; @@ -8021,12 +8051,12 @@ in modules // { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.4"; + version = "1.9.5"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "1sdxixj4p3wx245dm608bqw5bdabl701qab0ar5wjivyd6mfga5d"; + sha256 = "19kaw9flk9jjz1n7q378waybxnkrrhkq240lby4zaaas62nnfip5"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) @@ -8045,12 +8075,12 @@ in modules // { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.11"; + version = "1.8.12"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1yrmlj3h2hp5kc5m11ybya21x2wfr5bqqbkcsw6hknj86pkqn57c"; + sha256 = "04vi1rmin161drssqhi9n54j6mz8l6vs46pc7zbn50vzacysg3xn"; }; # too complicated to setup @@ -10265,11 +10295,11 @@ in modules // { }; httplib2 = buildPythonPackage rec { - name = "httplib2-0.9.1"; + name = "httplib2-0.9.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz"; - sha256 = "1xc3clbrf77r0600kja71j7hk1218sjiq0gfmb8vjdajka8kjqxw"; + sha256 = "126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3"; }; meta = { @@ -12503,7 +12533,7 @@ in modules // { patchPhase = optionalString stdenv.isLinux '' substituteInPlace monotonic.py --replace \ - "ctypes.util.find_library('c')" "'${stdenv.glibc}/lib/libc.so.6'" + "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; }; @@ -15557,7 +15587,7 @@ in modules // { meta = { description = "Bringing the power of python to stream editing"; homepage = https://github.com/timbertson/piep; - maintainers = with maintainers; [ gfxmonk ]; + maintainers = with maintainers; [ timbertson ]; license = licenses.gpl3; }; }; @@ -15695,7 +15725,7 @@ in modules // { }; prePatch = '' - substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile}/lib/libsndfile.so'" + substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'" ''; # https://github.com/bastibe/PySoundFile/issues/157 @@ -15758,13 +15788,15 @@ in modules // { ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - preConfigure = '' + preConfigure = let + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; + -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 ; s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ; s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;' '' # Remove impurities @@ -16421,7 +16453,7 @@ in modules // { preConfigure = '' substituteInPlace setup.py \ --replace '"/usr/include"' '"${pkgs.gdb}/include"' \ - --replace '"/usr/lib"' '"${pkgs.binutils}/lib"' + --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"' ''; meta = { @@ -16835,11 +16867,11 @@ in modules // { doCheck = false; preConfigure = '' - export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" ''; #+ optionalString isDarwin '' - # export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib" + # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" #''; meta = { @@ -17588,7 +17620,7 @@ in modules // { postPatch = '' sed -i -e '/udev_library_name/,/^ *libudev/ { - s|CDLL([^,]*|CDLL("${pkgs.udev}/lib/libudev.so.1"|p; d + s|CDLL([^,]*|CDLL("${pkgs.libudev.out}/lib/libudev.so.1"|p; d }' pyudev/_libudev.py ''; @@ -18037,8 +18069,8 @@ in modules // { patchPhase = '' substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite}/lib" + --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ + --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" ''; # error: invalid command 'test' @@ -18094,9 +18126,11 @@ in modules // { cd Source python setup.py backport python setup.py configure \ - --apr-inc-dir=${pkgs.apr}/include/apr-1 \ - --apu-inc-dir=${pkgs.aprutil}/include/apr-1 \ - --apr-lib-dir=${pkgs.apr}/lib \ + --apr-inc-dir=${pkgs.apr.dev}/include \ + --apu-inc-dir=${pkgs.aprutil.dev}/include \ + --apr-lib-dir=${pkgs.apr.out}/lib \ + --svn-lib-dir=${pkgs.subversion.out}/lib \ + --svn-bin-dir=${pkgs.subversion.out}/bin \ --svn-root-dir=${pkgs.subversion} '' + (if !stdenv.isDarwin then "" else '' sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile @@ -18406,7 +18440,7 @@ in modules // { reportlab = - let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); + let freetype = overrideDerivation pkgs.freetype (args: { dontDisableStatic = true; }); in buildPythonPackage rec { name = "reportlab-3.2.0"; @@ -19349,6 +19383,39 @@ in modules // { }; }; + s3transfer = buildPythonPackage rec { + version = "0.0.1"; # This version is required by awscli + name = "s3transfer-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/s3transfer/${name}.tar.gz"; + sha256 = "0ma31zvv7gy240xgd1zw853lpzkdci6mapzpg3x4vycann6yvf9b"; + }; + + foo = 1; + + propagatedBuildInputs = + [ self.botocore + ] ++ stdenv.lib.optional (pythonOlder "3") self.futures; + + buildInputs = with self; [ docutils mock nose coverage wheel unittest2 ]; + + checkPhase = '' + pushd s3transfer/tests + nosetests -v unit/ functional/ + popd + ''; + + # version on pypi has no tests/ dir + doCheck = false; + + meta = { + homepage = https://github.com/boto/s3transfer; + license = stdenv.lib.licenses.asl20; + description = "A library for managing Amazon S3 transfers"; + }; + }; + seqdiag = buildPythonPackage rec { name = "seqdiag-0.9.4"; @@ -19587,7 +19654,7 @@ in modules // { patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ @@ -21197,7 +21264,7 @@ in modules // { # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib + libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]} wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; @@ -21887,13 +21954,13 @@ in modules // { }; tzlocal = buildPythonPackage rec { - name = "tzlocal-1.1.1"; + name = "tzlocal-1.2.2"; propagatedBuildInputs = with self; [ pytz ]; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/t/tzlocal/tzlocal-1.1.1.zip"; - sha256 = "696bfd8d7c888de039af6c6fdf86fd52e32508277d89c75d200eb2c150487ed4"; + url = "https://pypi.python.org/packages/source/t/tzlocal/${name}.tar.gz"; + sha256 = "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb"; }; # test fail (timezone test fail) @@ -23534,14 +23601,14 @@ in modules // { tunigo = buildPythonPackage rec { name = "tunigo-${version}"; - version = "0.1.3"; + version = "1.0.0"; propagatedBuildInputs = with self; [ requests2 ]; src = pkgs.fetchFromGitHub { owner = "trygveaa"; repo = "python-tunigo"; rev = "v${version}"; - sha256 = "02ili37dbs5mk5f6v3fmi1sji39ymc4zyq44x0abxzr88nc8nh97"; + sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs"; }; buildInputs = with self; [ mock nose ]; @@ -23956,7 +24023,7 @@ in modules // { # Fix the USB backend library lookup postPatch = '' - libusb=${pkgs.libusb1}/lib/libusb-1.0.so + libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; @@ -24127,7 +24194,7 @@ in modules // { mock ]; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; meta = { description = "Graphite-web, without the interface. Just the rendering HTTP API"; @@ -25386,15 +25453,15 @@ in modules // { }; geeknote = buildPythonPackage rec { - version = "2015-03-02"; + version = "2015-05-11"; name = "geeknote-${version}"; disabled = ! isPy27; src = pkgs.fetchFromGitHub { owner = "VitaliyRodnenko"; repo = "geeknote"; - rev = "7ea2255bb6"; - sha256 = "0lw3m8g7r8r7dxhqih08x0i6agd201q2ig35a59rd4vygr3xqw2j"; + rev = "8489a87d044e164edb321ba9acca8d4631de3dca"; + sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf"; }; /* build with tests fails with "Can not create application dirictory : @@ -25737,7 +25804,7 @@ in modules // { patchPhase = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py + sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; propagatedBuildInputs = [ self.cffi self.six ]; @@ -25752,11 +25819,11 @@ in modules // { pafy = buildPythonPackage rec { name = "pafy-${version}"; - version = "0.4.3"; + version = "0.5.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pafy/${name}.tar.gz"; - sha256 = "1la4nn4n66p6dmcf1dyxw7i5j0xprmq82gwmxjv1jjis7vsnk254"; + sha256 = "1q699dcnq34nfgm0bg8mp5krhzk9cyirqdcadhs9al4fa5410igw"; }; propagatedBuildInputs = with self; [ youtube-dl ]; |